Author: cargilld
Date: Fri Aug 12 14:05:04 2005
New Revision: 232393
URL: http://svn.apache.org/viewcvs?rev=232393&view=rev
Log:
Change uppercase enums that were conflicting with other products.
Modified:
xerces/c/trunk/src/xercesc/util/regx/ParserForXMLSchema.cpp
xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp
xerces/c/trunk/src/xercesc/util/regx/RegxParser.hpp
Modified: xerces/c/trunk/src/xercesc/util/regx/ParserForXMLSchema.cpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/util/regx/ParserForXMLSchema.cpp?rev=232393&r1=232392&r2=232393&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/ParserForXMLSchema.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/ParserForXMLSchema.cpp Fri Aug 12
14:05:04 2005
@@ -99,7 +99,7 @@
RangeToken* ParserForXMLSchema::parseCharacterClass(const bool) {
- setParseContext(S_INBRACKETS);
+ setParseContext(Regex_S_INBRACKETS);
processNext();
RangeToken* base = 0;
@@ -273,7 +273,7 @@
tok->sortRanges();
tok->compactRanges();
- setParseContext(S_NORMAL);
+ setParseContext(Regex_S_NORMAL);
processNext();
return tok;
Modified: xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp?rev=232393&r1=232392&r2=232393&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp Fri Aug 12 14:05:04 2005
@@ -35,9 +35,9 @@
// ---------------------------------------------------------------------------
// Static member data initialization
// ---------------------------------------------------------------------------
-const unsigned short RegxParser::S_NORMAL = 0;
-const unsigned short RegxParser::S_INBRACKETS = 1;
-const unsigned short RegxParser::S_INXBRACKETS = 2;
+const unsigned short RegxParser::Regex_S_NORMAL = 0;
+const unsigned short RegxParser::Regex_S_INBRACKETS = 1;
+const unsigned short RegxParser::Regex_S_INXBRACKETS = 2;
// ---------------------------------------------------------------------------
// RegxParser::ReferencePostion: Constructors and Destructor
@@ -59,7 +59,7 @@
fOptions(0),
fOffset(0),
fNoGroups(1),
- fParseContext(S_NORMAL),
+ fParseContext(Regex_S_NORMAL),
fStringLen(0),
fState(0),
fCharData(0),
@@ -90,7 +90,7 @@
fOffset = 0;
fNoGroups = 1;
fHasBackReferences = false;
- setParseContext(S_NORMAL);
+ setParseContext(Regex_S_NORMAL);
if (fString)
fMemoryManager->deallocate(fString);//delete [] fString;
fString = XMLString::replicate(regxStr, fMemoryManager);
@@ -143,7 +143,7 @@
XMLCh ch = fString[fOffset++];
fCharData = ch;
- if (fParseContext == S_INBRACKETS) {
+ if (fParseContext == Regex_S_INBRACKETS) {
switch (ch) {
case chBackSlash:
@@ -1011,7 +1011,7 @@
RangeToken* RegxParser::parseCharacterClass(const bool useNRange) {
- setParseContext(S_INBRACKETS);
+ setParseContext(Regex_S_INBRACKETS);
processNext();
RangeToken* base = 0;
@@ -1184,7 +1184,7 @@
tok->getCaseInsensitiveToken(fTokenFactory);
}
- setParseContext(S_NORMAL);
+ setParseContext(Regex_S_NORMAL);
processNext();
return tok;
Modified: xerces/c/trunk/src/xercesc/util/regx/RegxParser.hpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/util/regx/RegxParser.hpp?rev=232393&r1=232392&r2=232393&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/RegxParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/RegxParser.hpp Fri Aug 12 14:05:04 2005
@@ -75,9 +75,9 @@
REGX_T_XMLSCHEMA_CC_SUBTRACTION = 24
};
- static const unsigned short S_NORMAL;
- static const unsigned short S_INBRACKETS;
- static const unsigned short S_INXBRACKETS;
+ static const unsigned short Regex_S_NORMAL;
+ static const unsigned short Regex_S_INBRACKETS;
+ static const unsigned short Regex_S_INXBRACKETS;
//
-----------------------------------------------------------------------
// Public Constructors and Destructor
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
