You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by kn...@apache.org on 2001/06/14 20:00:46 UTC

cvs commit: xml-xerces/c/src/internal XMLScanner2.cpp

knoaman     01/06/14 11:00:45

  Modified:    c/src/internal XMLScanner2.cpp
  Log:
  Namespace support: typo fix.
  
  Revision  Changes    Path
  1.35      +4 -4      xml-xerces/c/src/internal/XMLScanner2.cpp
  
  Index: XMLScanner2.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/internal/XMLScanner2.cpp,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- XMLScanner2.cpp	2001/06/07 19:08:35	1.34
  +++ XMLScanner2.cpp	2001/06/14 18:00:34	1.35
  @@ -55,7 +55,7 @@
    */
   
   /*
  - * $Id: XMLScanner2.cpp,v 1.34 2001/06/07 19:08:35 knoaman Exp $
  + * $Id: XMLScanner2.cpp,v 1.35 2001/06/14 18:00:34 knoaman Exp $
    */
   
   
  @@ -1186,9 +1186,9 @@
           }
       }
   
  -    SchemaGrammar* grammar = (SchemaGrammar*) fGrammarResolver->getGrammar(uri);
  +    Grammar* grammar = fGrammarResolver->getGrammar(uri);
   
  -    if ((fGrammar->getGrammarType() == Grammar::DTDGrammarType) || !grammar) {
  +    if (!grammar || grammar->getGrammarType() == Grammar::DTDGrammarType) {
           DOMParser parser;
           parser.setValidationScheme(DOMParser::Val_Never);
           parser.setDoNamespaces(true);
  @@ -1289,7 +1289,7 @@
                   fValidator->emitError(XMLValid::WrongTargetNamespace, loc, uri);
   
               grammar = new SchemaGrammar();
  -            TraverseSchema traverseSchema(root, fURIStringPool, grammar, fGrammarResolver, this, fValidator, srcToFill->getSystemId(), fEntityResolver, fErrorHandler);
  +            TraverseSchema traverseSchema(root, fURIStringPool, (SchemaGrammar*) grammar, fGrammarResolver, this, fValidator, srcToFill->getSystemId(), fEntityResolver, fErrorHandler);
           }
       }
       fGrammar = grammar;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org