svn commit: r483093 - in /xerces/c/branches/xerces-2.7/src/xercesc: internal/IGXMLScanner2.cpp validators/schema/SchemaValidator.cpp

[cargilld]

Author: cargilld
Date: Wed Dec  6 06:31:30 2006
New Revision: 483093

URL: http://svn.apache.org/viewvc?view=rev&rev=483093
Log:
Code cleanup

Modified:
    xerces/c/branches/xerces-2.7/src/xercesc/internal/IGXMLScanner2.cpp
    
xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/SchemaValidator.cpp

Modified: xerces/c/branches/xerces-2.7/src/xercesc/internal/IGXMLScanner2.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/internal/IGXMLScanner2.cpp?view=diff&rev=483093&r1=483092&r2=483093
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/internal/IGXMLScanner2.cpp 
(original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/internal/IGXMLScanner2.cpp Wed Dec 
 6 06:31:30 2006
@@ -1993,7 +1993,7 @@
             (
                 root
                 , fURIStringPool
-                , (SchemaGrammar*) grammar
+                , grammar
                 , fGrammarResolver
                 , this
                 , src.getSystemId()

Modified: 
xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/SchemaValidator.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/SchemaValidator.cpp?view=diff&rev=483093&r1=483092&r2=483093
==============================================================================
--- 
xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/SchemaValidator.cpp 
(original)
+++ 
xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/SchemaValidator.cpp 
Wed Dec  6 06:31:30 2006
@@ -1419,14 +1419,15 @@
                                     const ComplexTypeInfo* const baseInfo) {
 
     unsigned int derivedURI = derivedSpecNode->getElement()->getURI();
-    unsigned int baseURI = baseSpecNode->getElement()->getURI();
-    const XMLCh* derivedName = derivedSpecNode->getElement()->getLocalPart();
-    const XMLCh* baseName = baseSpecNode->getElement()->getLocalPart();
 
     // case of mixed complex types with attributes only
     if (derivedURI == XMLElementDecl::fgPCDataElemId) {
         return;
     }
+
+    unsigned int baseURI = baseSpecNode->getElement()->getURI();
+    const XMLCh* derivedName = derivedSpecNode->getElement()->getLocalPart();
+    const XMLCh* baseName = baseSpecNode->getElement()->getLocalPart();
 
     if (!XMLString::equals(derivedName, baseName) || derivedURI != baseURI) {
         ThrowXMLwithMemMgr(RuntimeException, XMLExcepts::PD_NameTypeOK1, 
fMemoryManager);        



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