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 2003/05/27 00:05:01 UTC

cvs commit: xml-xerces/c/src/xercesc/validators/schema/identity FieldValueMap.hpp ValueStoreCache.cpp

knoaman     2003/05/26 15:05:01

  Modified:    c/src/xercesc/validators/schema TraverseSchema.cpp
               c/src/xercesc/validators/schema/identity FieldValueMap.hpp
                        ValueStoreCache.cpp
  Log:
  Pass the memory manager to XMLString::replicate.
  
  Revision  Changes    Path
  1.75      +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.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- TraverseSchema.cpp	18 May 2003 14:02:08 -0000	1.74
  +++ TraverseSchema.cpp	26 May 2003 22:05:01 -0000	1.75
  @@ -381,7 +381,7 @@
       // Save current schema info
       SchemaInfo* currInfo = new (fMemoryManager) SchemaInfo(0, 0, 0, fTargetNSURI, fScopeCount,
                                             fNamespaceScope->increaseDepth(),
  -                                          XMLString::replicate(schemaURL),
  +                                          XMLString::replicate(schemaURL, fMemoryManager),
                                             fTargetNSURIString, schemaRoot,
                                             fMemoryManager);
   
  @@ -572,7 +572,7 @@
   
               fSchemaInfo = new (fMemoryManager) SchemaInfo(0, 0, 0, fTargetNSURI, fScopeCount,
                                            fNamespaceScope->increaseDepth(),
  -                                         XMLString::replicate(includeURL),
  +                                         XMLString::replicate(includeURL, fMemoryManager),
                                            fTargetNSURIString, root,
                                            fMemoryManager);
   
  @@ -3439,7 +3439,7 @@
                               enums = new (fMemoryManager) RefArrayVectorOf<XMLCh>(8, true, fMemoryManager);
                           }
   
  -                        enums->addElement(XMLString::replicate(attValue));
  +                        enums->addElement(XMLString::replicate(attValue, fMemoryManager));
                       }
                       else if (XMLString::equals(facetName, SchemaSymbols::fgELT_PATTERN)) {
   
  @@ -7585,7 +7585,7 @@
           redefSchemaInfo = fSchemaInfo;
           fSchemaInfo = new (fMemoryManager) SchemaInfo(0, 0, 0, fTargetNSURI, fScopeCount,
                                        fNamespaceScope->increaseDepth(),
  -                                     XMLString::replicate(includeURL),
  +                                     XMLString::replicate(includeURL, fMemoryManager),
                                        fTargetNSURIString, root,
                                        fMemoryManager);
   
  
  
  
  1.7       +3 -3      xml-xerces/c/src/xercesc/validators/schema/identity/FieldValueMap.hpp
  
  Index: FieldValueMap.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/FieldValueMap.hpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FieldValueMap.hpp	18 May 2003 14:02:09 -0000	1.6
  +++ FieldValueMap.hpp	26 May 2003 22:05:01 -0000	1.7
  @@ -210,11 +210,11 @@
   
           fFields->addElement(key);
           fValidators->addElement(dv);
  -        fValues->addElement(XMLString::replicate(value));
  +        fValues->addElement(XMLString::replicate(value, fMemoryManager));
       }
       else {
           fValidators->setElementAt(dv, keyIndex);
  -        fValues->setElementAt(XMLString::replicate(value), keyIndex);
  +        fValues->setElementAt(XMLString::replicate(value, fMemoryManager), keyIndex);
       }
   }
   
  
  
  
  1.8       +4 -1      xml-xerces/c/src/xercesc/validators/schema/identity/ValueStoreCache.cpp
  
  Index: ValueStoreCache.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/ValueStoreCache.cpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ValueStoreCache.cpp	18 May 2003 14:02:09 -0000	1.7
  +++ ValueStoreCache.cpp	26 May 2003 22:05:01 -0000	1.8
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.8  2003/05/26 22:05:01  knoaman
  + * Pass the memory manager to XMLString::replicate.
  + *
    * Revision 1.7  2003/05/18 14:02:09  knoaman
    * Memory manager implementation: pass per instance manager.
    *
  @@ -207,7 +210,7 @@
       for (unsigned int i=0; i<icCount; i++) {
   
           IdentityConstraint* ic = elemDecl->getIdentityConstraintAt(i);
  -        ValueStore* valueStore = valueStore = new (fMemoryManager) ValueStore(ic, fScanner, fMemoryManager);
  +        ValueStore* valueStore = new (fMemoryManager) ValueStore(ic, fScanner, fMemoryManager);
           fValueStores->addElement(valueStore);
           fIC2ValueStoreMap->put(ic, initialDepth, valueStore);
       }
  
  
  

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