svn commit: r671177 - /xerces/c/branches/xerces-2/src/xercesc/validators/schema/SchemaValidator.cpp

[borisk]

Author: borisk
Date: Tue Jun 24 07:08:15 2008
New Revision: 671177

URL: http://svn.apache.org/viewvc?rev=671177&view=rev
Log:
Fix a bug introduced with a previous commit.

Modified:
    xerces/c/branches/xerces-2/src/xercesc/validators/schema/SchemaValidator.cpp

Modified: 
xerces/c/branches/xerces-2/src/xercesc/validators/schema/SchemaValidator.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/branches/xerces-2/src/xercesc/validators/schema/SchemaValidator.cpp?rev=671177&r1=671176&r2=671177&view=diff
==============================================================================
--- 
xerces/c/branches/xerces-2/src/xercesc/validators/schema/SchemaValidator.cpp 
(original)
+++ 
xerces/c/branches/xerces-2/src/xercesc/validators/schema/SchemaValidator.cpp 
Tue Jun 24 07:08:15 2008
@@ -1839,7 +1839,7 @@
 
 bool SchemaValidator::checkNSSubsetChoiceRoot(const ContentSpecNode* const 
derivedSpecNode,
                                     const ContentSpecNode* const baseSpecNode) 
{
-    bool found = false;       
+    bool found = false;
 
     if (baseSpecNode->getType() == ContentSpecNode::Any_NS_Choice) {
         const ContentSpecNode* first = baseSpecNode->getFirst();
@@ -1849,7 +1849,7 @@
             found = checkNSSubsetChoiceRoot(derivedSpecNode, first);
             if (found) return true;
         }
-        if (second) { 
+        if (second) {
             found = checkNSSubsetChoiceRoot(derivedSpecNode, second);
             if (found) return true;
         }
@@ -1858,7 +1858,7 @@
         found = checkNSSubsetChoice(derivedSpecNode, baseSpecNode);
     }
 
-    return found; 
+    return found;
 }
 
 bool SchemaValidator::checkNSSubsetChoice(const ContentSpecNode* const 
derivedSpecNode,
@@ -1894,7 +1894,7 @@
     //
     if (((derivedType & 0x0f) == ContentSpecNode::Any_Other) &&
         ((baseType & 0x0f) == ContentSpecNode::Any_Other) &&
-        baseURI == derivedURI || baseURI == 1) {
+        (baseURI == derivedURI || baseURI == 1)) {
         return true;
     }
 
@@ -1906,7 +1906,7 @@
         }
 
         if (((baseType & 0x0f) == ContentSpecNode::Any_Other) &&
-            derivedURI == 1 || baseURI != derivedURI) {
+            (derivedURI == 1 || baseURI != derivedURI)) {
             return true;
         }
     }



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