dbertoni 00/09/27 09:38:12
Modified: c/src/ICUBridge ICUBridge.cpp
ICUBridgeCollationCompareFunctor.cpp
Log:
Output transcoding support.
Revision Changes Path
1.8 +4 -4 xml-xalan/c/src/ICUBridge/ICUBridge.cpp
Index: ICUBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUBridge.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ICUBridge.cpp 2000/09/19 14:36:07 1.7
+++ ICUBridge.cpp 2000/09/27 16:38:09 1.8
@@ -92,7 +92,7 @@
}
else
{
-#if defined(XALAN_ICU_BRIDGE_UCHAR_MISMATCH)
+#if defined(XALAN_XALANDOMCHAR_USHORT_MISMATCH)
// Create a buffer to copy out the UnicodeString data...
UCharVectorType theBuffer;
@@ -135,7 +135,7 @@
const XalanDOMString
ICUBridge::UnicodeStringToXalanDOMString(const UnicodeString&
theString)
{
-#if defined(XALAN_ICU_BRIDGE_UCHAR_MISMATCH)
+#if defined(XALAN_XALANDOMCHAR_USHORT_MISMATCH)
// If XalanDOMChar is larger than the ICU's UChar, we have to more
work...
const int32_t theLength = theString.length();
@@ -179,7 +179,7 @@
const UnicodeString& theString,
XalanDOMString& theResult)
{
-#if defined(XALAN_ICU_BRIDGE_UCHAR_MISMATCH)
+#if defined(XALAN_XALANDOMCHAR_USHORT_MISMATCH)
// If XalanDOMChar is larger than the ICU's UChar, we have to more work.
// Don't bother to provide the optimized version, just call to the
@@ -327,7 +327,7 @@
{
// OK, do the compare...
return theCollator->compare(
-#if defined(XALAN_ICU_BRIDGE_UCHAR_MISMATCH)
+#if defined(XALAN_XALANDOMCHAR_USHORT_MISMATCH)
XalanDOMCharStringToUnicodeString(theLHS),
XalanDOMCharStringToUnicodeString(theRHS));
#else
1.5 +1 -1
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ICUBridgeCollationCompareFunctor.cpp 2000/07/28 17:56:07 1.4
+++ ICUBridgeCollationCompareFunctor.cpp 2000/09/27 16:38:10 1.5
@@ -112,7 +112,7 @@
{
assert(m_collator != 0);
-#if defined(XALAN_ICU_BRIDGE_UCHAR_MISMATCH)
+#if defined(XALAN_XALANDOMCHAR_USHORT_MISMATCH)
return m_collator->compare(
ICUBridge::XalanDOMCharStringToUnicodeString(theLHS),
ICUBridge::XalanDOMCharStringToUnicodeString(theRHS));
