You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2006/09/13 10:05:29 UTC
svn commit: r442891 - in /xerces/c/trunk/src/xercesc/util/regx:
RangeToken.cpp TokenFactory.cpp XMLUniCharacter.cpp
Author: amassari
Date: Wed Sep 13 01:05:28 2006
New Revision: 442891
URL: http://svn.apache.org/viewvc?view=rev&rev=442891
Log:
Availability of ICU is now flagged by XERCES_USE_TRANSCODER_ICU, not XML_USE_ICU_TRANSCODER
Modified:
xerces/c/trunk/src/xercesc/util/regx/RangeToken.cpp
xerces/c/trunk/src/xercesc/util/regx/TokenFactory.cpp
xerces/c/trunk/src/xercesc/util/regx/XMLUniCharacter.cpp
Modified: xerces/c/trunk/src/xercesc/util/regx/RangeToken.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/RangeToken.cpp?view=diff&rev=442891&r1=442890&r2=442891
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/RangeToken.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/RangeToken.cpp Wed Sep 13 01:05:28 2006
@@ -21,16 +21,20 @@
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <assert.h>
#include <xercesc/util/regx/RangeToken.hpp>
#include <xercesc/util/regx/TokenFactory.hpp>
#include <xercesc/util/IllegalArgumentException.hpp>
-#if defined(XML_USE_ICU_TRANSCODER) || defined (XML_USE_UNICONV390_TRANSCODER)
-#include <unicode/uchar.h>
+#if XERCES_USE_TRANSCODER_ICU
+ #include <unicode/uchar.h>
#else
-#include <xercesc/util/XMLUniDefs.hpp>
+ #include <xercesc/util/XMLUniDefs.hpp>
#endif
XERCES_CPP_NAMESPACE_BEGIN
@@ -79,7 +83,7 @@
for (unsigned int i = 0; i < fElemCount - 1; i += 2) {
for (XMLInt32 ch = fRanges[i]; ch <= fRanges[i + 1]; ++ch) {
-#if defined(XML_USE_ICU_TRANSCODER) || defined (XML_USE_UNICONV390_TRANSCODER)
+#if XERCES_USE_TRANSCODER_ICU
const XMLInt32 upperCh = u_toupper(ch);
if (upperCh != ch)
Modified: xerces/c/trunk/src/xercesc/util/regx/TokenFactory.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/TokenFactory.cpp?view=diff&rev=442891&r1=442890&r2=442891
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/TokenFactory.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/TokenFactory.cpp Wed Sep 13 01:05:28 2006
@@ -344,14 +344,18 @@
}
/*
-#if defined (XML_USE_ICU_TRANSCODER)
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if XERCES_USE_TRANSCODER_ICU
#include <unicode/uchar.h>
#endif
#include <stdio.h>
void TokenFactory::printUnicode() {
-#if defined (XML_USE_ICU_TRANSCODER)
+#if XERCES_USE_TRANSCODER_ICU
//
// Write it out to a temp file to be read back into this source later.
//
Modified: xerces/c/trunk/src/xercesc/util/regx/XMLUniCharacter.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/XMLUniCharacter.cpp?view=diff&rev=442891&r1=442890&r2=442891
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/XMLUniCharacter.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/XMLUniCharacter.cpp Wed Sep 13 01:05:28 2006
@@ -22,9 +22,13 @@
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <xercesc/util/regx/XMLUniCharacter.hpp>
-#if defined (XML_USE_ICU_TRANSCODER) || defined (XML_USE_UNICONV390_TRANSCODER)
+#if XERCES_USE_TRANSCODER_ICU
#include <unicode/uchar.h>
#else
#include <xercesc/util/regx/UniCharTable.hpp>
@@ -37,7 +41,7 @@
// ---------------------------------------------------------------------------
unsigned short XMLUniCharacter::getType(const XMLCh ch) {
-#if defined (XML_USE_ICU_TRANSCODER) || defined (XML_USE_UNICONV390_TRANSCODER)
+#if XERCES_USE_TRANSCODER_ICU
return (unsigned short) u_charType(ch);
#else
return (unsigned short) fgUniCharsTable[ch];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org