dbertoni 2002/08/20 14:31:59
Modified: c/src/ICUBridge ICUBridge.cpp ICUBridgeCleanup.cpp
ICUXalanNumberFormatProxy.cpp
Log:
Maintain compatibility with version of ICU prior to 2.0.
Revision Changes Path
1.18 +4 -0 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ICUBridge.cpp 12 Aug 2002 03:54:43 -0000 1.17
+++ ICUBridge.cpp 20 Aug 2002 21:31:58 -0000 1.18
@@ -312,7 +312,11 @@
theDFS->setSymbol(DecimalFormatSymbols::kZeroDigitSymbol,
UChar(theXalanDFS.getZeroDigit()));
theDFS->setSymbol(DecimalFormatSymbols::kGroupingSeparatorSymbol,
UChar(theXalanDFS.getGroupingSeparator()));
theDFS->setSymbol(DecimalFormatSymbols::kDecimalSeparatorSymbol,
UChar(theXalanDFS.getDecimalSeparator()));
+#if U_ICU_VERSION_MAJOR_NUM < 2
+ theDFS->setSymbol(DecimalFormatSymbols::kPermillSymbol,
UChar(theXalanDFS.getPerMill()));
+#else
theDFS->setSymbol(DecimalFormatSymbols::kPerMillSymbol,
UChar(theXalanDFS.getPerMill()));
+#endif
theDFS->setSymbol(DecimalFormatSymbols::kPercentSymbol,
UChar(theXalanDFS.getPercent()));
theDFS->setSymbol(DecimalFormatSymbols::kDigitSymbol,
UChar(theXalanDFS.getDigit()));
theDFS->setSymbol(DecimalFormatSymbols::kPatternSeparatorSymbol,
UChar(theXalanDFS.getPatternSeparator()));
1.2 +1 -1 xml-xalan/c/src/ICUBridge/ICUBridgeCleanup.cpp
Index: ICUBridgeCleanup.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUBridgeCleanup.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ICUBridgeCleanup.cpp 5 Apr 2002 03:45:41 -0000 1.1
+++ ICUBridgeCleanup.cpp 20 Aug 2002 21:31:58 -0000 1.2
@@ -59,7 +59,7 @@
-#include <unicode/uversion.h>
+#include <unicode/utypes.h>
#if (U_ICU_VERSION_MAJOR_NUM >= 2)
#include <unicode/uclean.h>
#endif
1.10 +2 -0 xml-xalan/c/src/ICUBridge/ICUXalanNumberFormatProxy.cpp
Index: ICUXalanNumberFormatProxy.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUXalanNumberFormatProxy.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ICUXalanNumberFormatProxy.cpp 4 Jan 2002 19:12:43 -0000 1.9
+++ ICUXalanNumberFormatProxy.cpp 20 Aug 2002 21:31:58 -0000 1.10
@@ -63,8 +63,10 @@
+#if U_ICU_VERSION_MAJOR_NUM >= 2
// this is the ICU's macro for using namespace ...
U_NAMESPACE_USE
+#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
