svn commit: r232379 - /xerces/c/trunk/src/xercesc/validators/schema/identity/XPathMatcher.cpp

[cargilld]

Author: cargilld
Date: Fri Aug 12 13:47:24 2005
New Revision: 232379

URL: http://svn.apache.org/viewcvs?rev=232379&view=rev
Log:
Change uppercase enums that were conflicting with other products.

Modified:
    xerces/c/trunk/src/xercesc/validators/schema/identity/XPathMatcher.cpp

Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/XPathMatcher.cpp
URL: 
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/identity/XPathMatcher.cpp?rev=232379&r1=232378&r2=232379&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/identity/XPathMatcher.cpp 
(original)
+++ xerces/c/trunk/src/xercesc/validators/schema/identity/XPathMatcher.cpp Fri 
Aug 12 13:47:24 2005
@@ -171,7 +171,7 @@
         int stepSize = locPath->getStepSize();
 
         while (fCurrentStep[i] < stepSize &&
-               locPath->getStep(fCurrentStep[i])->getAxisType() == 
XercesStep::SELF) {
+               locPath->getStep(fCurrentStep[i])->getAxisType() == 
XercesStep::AxisType_SELF) {
             fCurrentStep[i]++;
         }
 
@@ -188,7 +188,7 @@
         int descendantStep = fCurrentStep[i];
 
         while (fCurrentStep[i] < stepSize &&
-               locPath->getStep(fCurrentStep[i])->getAxisType() == 
XercesStep::DESCENDANT) {
+               locPath->getStep(fCurrentStep[i])->getAxisType() == 
XercesStep::AxisType_DESCENDANT) {
             fCurrentStep[i]++;
         }
 
@@ -201,12 +201,12 @@
 
         // match child::... step, if haven't consumed any self::node()
         if ((fCurrentStep[i] == startStep || fCurrentStep[i] > descendantStep) 
&&
-            locPath->getStep(fCurrentStep[i])->getAxisType() == 
XercesStep::CHILD) {
+            locPath->getStep(fCurrentStep[i])->getAxisType() == 
XercesStep::AxisType_CHILD) {
 
             XercesStep* step = locPath->getStep(fCurrentStep[i]);
             XercesNodeTest* nodeTest = step->getNodeTest();
 
-            if (nodeTest->getType() == XercesNodeTest::QNAME) {
+            if (nodeTest->getType() == XercesNodeTest::NodeType_QNAME) {
 
                 QName elemQName(elemPrefix, 
elemDecl.getElementName()->getLocalPart(), urlId, fMemoryManager);
 
@@ -242,7 +242,7 @@
 
         // match attribute::... step
         if (fCurrentStep[i] < stepSize &&
-            locPath->getStep(fCurrentStep[i])->getAxisType() == 
XercesStep::ATTRIBUTE) {
+            locPath->getStep(fCurrentStep[i])->getAxisType() == 
XercesStep::AxisType_ATTRIBUTE) {
 
             if (attrCount) {
 
@@ -252,7 +252,7 @@
 
                     const XMLAttr* curDef = attrList.elementAt(attrIndex);
 
-                    if (nodeTest->getType() != XercesNodeTest::QNAME ||
+                    if (nodeTest->getType() != XercesNodeTest::NodeType_QNAME 
||
                         (*(nodeTest->getName()) == *(curDef->getAttName()))) {
 
                         fCurrentStep[i]++;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]