cvs commit: xml-xerces/c/src/xercesc/validators/schema TraverseSchema.cpp

[gareth]

gareth      2005/03/14 09:07:01

  Modified:    c/src/xercesc/validators/schema TraverseSchema.cpp
  Log:
  Fix for Jira 1376. Patch by Christian Will.
  
  Revision  Changes    Path
  1.132     +5 -5      
xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.cpp
  
  Index: TraverseSchema.cpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.cpp,v
  retrieving revision 1.131
  retrieving revision 1.132
  diff -u -r1.131 -r1.132
  --- TraverseSchema.cpp        7 Mar 2005 20:11:21 -0000       1.131
  +++ TraverseSchema.cpp        14 Mar 2005 17:07:01 -0000      1.132
  @@ -2962,7 +2962,7 @@
               // create & register validator for "generated" type
               try {
                   newDV = fDatatypeRegistry->createDatatypeValidator(
  -                    qualifiedName, baseValidator, 0, 0, true, finalSet, 
true, fMemoryManager );
  +                    qualifiedName, baseValidator, 0, 0, true, finalSet, 
true, fGrammarPoolMemoryManager);
               }
               catch (const XMLException& excep) {
                   reportSchemaError(contentElem, XMLUni::fgValidityDomain, 
XMLValid::DisplayErrorMessage, excep.getMessage());
  @@ -3227,7 +3227,7 @@
               fSchemaGrammar->putAnnotation(enums, janEnumAnnot.release());
   
           try {
  -            newDV = 
fDatatypeRegistry->createDatatypeValidator(qualifiedName, baseValidator, 
facets, enums, false, finalSet, true, fMemoryManager);
  +            newDV = 
fDatatypeRegistry->createDatatypeValidator(qualifiedName, baseValidator, 
facets, enums, false, finalSet, true, fGrammarPoolMemoryManager);
           }
           catch (const XMLException& excep) {
               reportSchemaError(contentElem, XMLUni::fgValidityDomain, 
XMLValid::DisplayErrorMessage, excep.getMessage());
  @@ -3362,7 +3362,7 @@
       janValidators.orphan();
   
       try {
  -        newDV = fDatatypeRegistry->createDatatypeValidator(qualifiedName, 
validators, finalSet, true, fMemoryManager);
  +        newDV = fDatatypeRegistry->createDatatypeValidator(qualifiedName, 
validators, finalSet, true, fGrammarPoolMemoryManager);
       }
       catch (const XMLException& excep) {
           reportSchemaError(contentElem, XMLUni::fgValidityDomain, 
XMLValid::DisplayErrorMessage, excep.getMessage());
  @@ -3725,7 +3725,7 @@
                           (
                               qualifiedName,
                               typeInfo->getBaseDatatypeValidator(),
  -                            facets, enums, false, 0, true, fMemoryManager
  +                            facets, enums, false, 0, true, 
fGrammarPoolMemoryManager
                           );
                       simpleDV->setAnonymous();
                       typeInfo->setDatatypeValidator(simpleDV);
  
  
  

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