dbertoni 01/01/05 15:51:08
Modified: c/src/ICUBridge ICUBridgeCollationCompareFunctor.cpp
Log:
Changed code since XMLCh and XalanDOMChar are always an unsigned short.
Revision Changes Path
1.6 +7 -5
xml-xalan/c/src/ICUBridge/ICUBridgeCollationCompareFunctor.cpp
Index: ICUBridgeCollationCompareFunctor.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/ICUBridge/ICUBridgeCollationCompareFunctor.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ICUBridgeCollationCompareFunctor.cpp 2000/09/27 16:38:10 1.5
+++ ICUBridgeCollationCompareFunctor.cpp 2001/01/05 23:51:07 1.6
@@ -112,11 +112,7 @@
{
assert(m_collator != 0);
-#if defined(XALAN_XALANDOMCHAR_USHORT_MISMATCH)
- return m_collator->compare(
-
ICUBridge::XalanDOMCharStringToUnicodeString(theLHS),
-
ICUBridge::XalanDOMCharStringToUnicodeString(theRHS));
-#else
+#if defined(XALAN_USE_XERCES_DOMSTRING)
// $$$ ToDo: This code is necessary because DOMStrings can
// have a null representation.
const XalanDOMChar* const lhs = theLHS == 0 ? &dummy :
theLHS;
@@ -127,6 +123,12 @@
length(lhs),
rhs,
length(rhs));
+#else
+ return m_collator->compare(
+ theLHS,
+ length(theLHS),
+ theRHS,
+ length(theRHS));
#endif
}
}
