[prev in list] [next in list] [prev in thread] [next in thread]
List: xerces-cvs
Subject: svn commit: r575245 - in /xerces/c/trunk/src/xercesc: framework/
From: cargilld () apache ! org
Date: 2007-09-13 9:49:47
Message-ID: 20070913094949.301C31A9832 () eris ! apache ! org
[Download RAW message or body]
Author: cargilld
Date: Thu Sep 13 02:49:46 2007
New Revision: 575245
URL: http://svn.apache.org/viewvc?rev=575245&view=rev
Log:
use correct memory manager not one from deserializer
Modified:
xerces/c/trunk/src/xercesc/framework/XMLContentModel.hpp
xerces/c/trunk/src/xercesc/validators/DTD/DTDValidator.cpp
xerces/c/trunk/src/xercesc/validators/common/AllContentModel.cpp
xerces/c/trunk/src/xercesc/validators/common/AllContentModel.hpp
xerces/c/trunk/src/xercesc/validators/common/DFAContentModel.cpp
xerces/c/trunk/src/xercesc/validators/common/DFAContentModel.hpp
xerces/c/trunk/src/xercesc/validators/common/MixedContentModel.cpp
xerces/c/trunk/src/xercesc/validators/common/MixedContentModel.hpp
xerces/c/trunk/src/xercesc/validators/common/SimpleContentModel.cpp
xerces/c/trunk/src/xercesc/validators/common/SimpleContentModel.hpp
xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp
Modified: xerces/c/trunk/src/xercesc/framework/XMLContentModel.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLContentModel.hpp?rev=575245&r1=575244&r2=575245&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLContentModel.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLContentModel.hpp Thu Sep 13 02:49:46 2007
@@ -83,6 +83,7 @@
QName** const children
, const unsigned int childCount
, const unsigned int emptyNamespaceId
+ , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
) const = 0;
virtual int validateContentSpecial
@@ -92,6 +93,7 @@
, const unsigned int emptyNamespaceId
, GrammarResolver* const pGrammarResolver
, XMLStringPool* const pStringPool
+ , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
) const =0;
virtual void checkUniqueParticleAttribution
Modified: xerces/c/trunk/src/xercesc/validators/DTD/DTDValidator.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/DTD/DTDValidator.cpp?rev=575245&r1=575244&r2=575245&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/DTD/DTDValidator.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/DTD/DTDValidator.cpp Thu Sep 13 02:49:46 \
2007 @@ -88,7 +88,7 @@
const XMLContentModel* elemCM = elemDecl->getContentModel();
// Ask it to validate and return its return
- return elemCM->validateContent(children, childCount, \
getScanner()->getEmptyNamespaceId()); + return \
elemCM->validateContent(children, childCount, getScanner()->getEmptyNamespaceId(), \
getScanner()->getMemoryManager()); }
else
{
Modified: xerces/c/trunk/src/xercesc/validators/common/AllContentModel.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/common/AllContentModel.cpp?rev=575245&r1=575244&r2=575245&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/common/AllContentModel.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/common/AllContentModel.cpp Thu Sep 13 \
02:49:46 2007 @@ -107,7 +107,8 @@
int
AllContentModel::validateContent( QName** const children
, const unsigned int childCount
- , const unsigned int) const
+ , const unsigned int
+ , MemoryManager* const manager) const
{
// If <all> had minOccurs of zero and there are
// no children to validate, trivially validate
@@ -118,13 +119,11 @@
unsigned int numRequiredSeen = 0;
if(childCount > 0)
- {
- MemoryManager* const localMemoryManager = children[0]->getMemoryManager();
-
+ {
// Check for duplicate element
- bool* elementSeen = (bool*) \
localMemoryManager->allocate(fCount*sizeof(bool)); //new bool[fCount]; + bool* \
elementSeen = (bool*) manager->allocate(fCount*sizeof(bool)); //new bool[fCount];
- const ArrayJanitor<bool> jan(elementSeen, localMemoryManager);
+ const ArrayJanitor<bool> jan(elementSeen, manager);
// initialize the array
for (unsigned int i = 0; i < fCount; i++)
@@ -183,7 +182,8 @@
, const unsigned int childCount
, const unsigned int
, GrammarResolver* const pGrammarResolver
- , XMLStringPool* const pStringPool) \
const + , XMLStringPool* const \
pStringPool + , MemoryManager* const \
manager) const {
// If <all> had minOccurs of zero and there are
// no children to validate, trivially validate
@@ -197,12 +197,10 @@
{
SubstitutionGroupComparator comparator(pGrammarResolver, pStringPool);
- MemoryManager* const localMemoryManager = children[0]->getMemoryManager();
-
// Check for duplicate element
- bool* elementSeen = (bool*) \
localMemoryManager->allocate(fCount*sizeof(bool)); //new bool[fCount]; + bool* \
elementSeen = (bool*) manager->allocate(fCount*sizeof(bool)); //new bool[fCount];
- const ArrayJanitor<bool> jan(elementSeen, localMemoryManager);
+ const ArrayJanitor<bool> jan(elementSeen, manager);
// initialize the array
for (unsigned int i = 0; i < fCount; i++)
Modified: xerces/c/trunk/src/xercesc/validators/common/AllContentModel.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/common/AllContentModel.hpp?rev=575245&r1=575244&r2=575245&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/common/AllContentModel.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/common/AllContentModel.hpp Thu Sep 13 \
02:49:46 2007 @@ -62,6 +62,7 @@
QName** const children
, const unsigned int childCount
, const unsigned int emptyNamespaceId
+ , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
) const;
virtual int validateContentSpecial
@@ -71,6 +72,7 @@
, const unsigned int emptyNamespaceId
, GrammarResolver* const pGrammarResolver
, XMLStringPool* const pStringPool
+ , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
) const;
virtual ContentLeafNameTypeVector* getContentLeafNameTypeVector() const ;
Modified: xerces/c/trunk/src/xercesc/validators/common/DFAContentModel.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/common/DFAContentModel.cpp?rev=575245&r1=575244&r2=575245&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/common/DFAContentModel.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/common/DFAContentModel.cpp Thu Sep 13 \
02:49:46 2007 @@ -130,7 +130,8 @@
int
DFAContentModel::validateContent( QName** const children
, const unsigned int childCount
- , const unsigned int) const
+ , const unsigned int
+ , MemoryManager* const) const
{
//
// If there are no children, then either we fail on the 0th element
@@ -242,7 +243,8 @@
, const unsigned int childCount
, const unsigned int
, GrammarResolver* const \
pGrammarResolver
- , XMLStringPool* const pStringPool) \
const + , XMLStringPool* const \
pStringPool + , MemoryManager* const) \
const {
SubstitutionGroupComparator comparator(pGrammarResolver, pStringPool);
Modified: xerces/c/trunk/src/xercesc/validators/common/DFAContentModel.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/common/DFAContentModel.hpp?rev=575245&r1=575244&r2=575245&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/common/DFAContentModel.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/common/DFAContentModel.hpp Thu Sep 13 \
02:49:46 2007 @@ -77,6 +77,7 @@
QName** const children
, const unsigned int childCount
, const unsigned int emptyNamespaceId
+ , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
) const;
virtual int validateContentSpecial
@@ -86,6 +87,7 @@
, const unsigned int emptyNamespaceId
, GrammarResolver* const pGrammarResolver
, XMLStringPool* const pStringPool
+ , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
) const;
virtual void checkUniqueParticleAttribution
Modified: xerces/c/trunk/src/xercesc/validators/common/MixedContentModel.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/common/MixedContentModel.cpp?rev=575245&r1=575244&r2=575245&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/common/MixedContentModel.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/common/MixedContentModel.cpp Thu Sep 13 \
02:49:46 2007 @@ -141,7 +141,8 @@
int
MixedContentModel::validateContent( QName** const children
, const unsigned int childCount
- , const unsigned int) const
+ , const unsigned int
+ , MemoryManager* const) const
{
// must match order
if (fOrdered) {
@@ -250,7 +251,8 @@
, const unsigned int childCount
, const unsigned int
, GrammarResolver* const \
pGrammarResolver
- , XMLStringPool* const pStringPool) \
const + , XMLStringPool* const \
pStringPool + , MemoryManager* const) \
const {
SubstitutionGroupComparator comparator(pGrammarResolver, pStringPool);
Modified: xerces/c/trunk/src/xercesc/validators/common/MixedContentModel.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/common/MixedContentModel.hpp?rev=575245&r1=575244&r2=575245&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/common/MixedContentModel.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/common/MixedContentModel.hpp Thu Sep 13 \
02:49:46 2007 @@ -73,6 +73,7 @@
QName** const children
, const unsigned int childCount
, const unsigned int emptyNamespaceId
+ , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
) const;
virtual int validateContentSpecial
@@ -82,6 +83,7 @@
, const unsigned int emptyNamespaceId
, GrammarResolver* const pGrammarResolver
, XMLStringPool* const pStringPool
+ , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
) const;
virtual ContentLeafNameTypeVector* getContentLeafNameTypeVector() const ;
Modified: xerces/c/trunk/src/xercesc/validators/common/SimpleContentModel.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/common/SimpleContentModel.cpp?rev=575245&r1=575244&r2=575245&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/common/SimpleContentModel.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/common/SimpleContentModel.cpp Thu Sep 13 \
02:49:46 2007 @@ -42,7 +42,8 @@
int
SimpleContentModel::validateContent(QName** const children
, const unsigned int childCount
- , const unsigned int) const
+ , const unsigned int
+ , MemoryManager* const) const
{
//
// According to the type of operation, we do the correct type of
@@ -231,7 +232,8 @@
, const unsigned int childCount
, const unsigned int
, GrammarResolver* const \
pGrammarResolver
- , XMLStringPool* const pStringPool) \
const + , XMLStringPool* const \
pStringPool + , MemoryManager* const) \
const {
SubstitutionGroupComparator comparator(pGrammarResolver, pStringPool);
Modified: xerces/c/trunk/src/xercesc/validators/common/SimpleContentModel.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/common/SimpleContentModel.hpp?rev=575245&r1=575244&r2=575245&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/common/SimpleContentModel.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/common/SimpleContentModel.hpp Thu Sep 13 \
02:49:46 2007 @@ -77,6 +77,7 @@
QName** const children
, const unsigned int childCount
, const unsigned int emptyNamespaceId
+ , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
) const;
virtual int validateContentSpecial
@@ -86,6 +87,7 @@
, const unsigned int emptyNamespaceId
, GrammarResolver* const pGrammarResolver
, XMLStringPool* const pStringPool
+ , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
) const;
virtual ContentLeafNameTypeVector *getContentLeafNameTypeVector() const;
Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp?rev=575245&r1=575244&r2=575245&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp Thu Sep 13 \
02:49:46 2007 @@ -135,13 +135,14 @@
// Ask it to validate and return its return
unsigned int emptyNS = getScanner()->getEmptyNamespaceId();
- int result = elemCM->validateContent(children, childCount, emptyNS);
+ int result = elemCM->validateContent(children, childCount, emptyNS, \
getScanner()->getMemoryManager()); if (result != -1) {
result = elemCM->validateContentSpecial(children
, childCount
, emptyNS
, fGrammarResolver
- , \
fGrammarResolver->getStringPool()); + \
, fGrammarResolver->getStringPool() + \
, getScanner()->getMemoryManager()); }
if(result != -1) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic