neilg 2003/11/14 14:34:21
Modified: c/src/xercesc/internal XMLGrammarPoolImpl.cpp
XMLGrammarPoolImpl.hpp
Log:
removed methods made unnecessary by new XSModel implementation design; thanks to
David Cargill
Revision Changes Path
1.13 +4 -29 xml-xerces/c/src/xercesc/internal/XMLGrammarPoolImpl.cpp
Index: XMLGrammarPoolImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLGrammarPoolImpl.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLGrammarPoolImpl.cpp 7 Nov 2003 20:30:28 -0000 1.12
+++ XMLGrammarPoolImpl.cpp 14 Nov 2003 22:34:20 -0000 1.13
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.13 2003/11/14 22:34:20 neilg
+ * removed methods made unnecessary by new XSModel implementation design; thanks to
David Cargill
+ *
* Revision 1.12 2003/11/07 20:30:28 neilg
* fix compilation errors on AIX and HPUX; thanks to David Cargill
*
@@ -114,10 +117,6 @@
XERCES_CPP_NAMESPACE_BEGIN
-void updatePSVIvectorElemIds(ValueVectorOf<SchemaElementDecl*>* vectorElemDecls,
- SchemaGrammar* const grammar);
-
-
// ---------------------------------------------------------------------------
// XMLGrammarPoolImpl: constructor and destructor
// ---------------------------------------------------------------------------
@@ -161,16 +160,7 @@
fGrammarRegistry->put((void*) grammarKey, gramToCache);
- if (fDoPSVI && gramToCache->getGrammarType() == Grammar::SchemaGrammarType) {
- if (!fPSVIvectorElemDecls) {
- // REVISIT: what should the be the initial size?
- MemoryManager *memMgr = getMemoryManager();
- fPSVIvectorElemDecls = new (memMgr)
ValueVectorOf<SchemaElementDecl*>(64, memMgr);
- }
- updatePSVIvectorElemIds(fPSVIvectorElemDecls, (SchemaGrammar*) gramToCache);
- }
return true;
-
}
Grammar* XMLGrammarPoolImpl::retrieveGrammar(XMLGrammarDescription* const gramDesc)
@@ -234,21 +224,6 @@
void XMLGrammarPoolImpl::setPSVI(const bool doPSVI)
{
fDoPSVI = doPSVI;
-}
-
-void updatePSVIvectorElemIds(ValueVectorOf<SchemaElementDecl*>* vectorElemDecls,
- SchemaGrammar* const grammar) {
-
- unsigned int vectorElemDeclsIndex = vectorElemDecls->size();
- RefHash3KeysIdPoolEnumerator<SchemaElementDecl> elemEnum =
grammar->getElemEnumerator();
-
- while (elemEnum.hasMoreElements())
- {
- SchemaElementDecl& curElem = elemEnum.nextElement();
- vectorElemDecls->addElement(&curElem);
- curElem.setElemId(vectorElemDeclsIndex);
- vectorElemDeclsIndex++;
- }
}
// -----------------------------------------------------------------------
1.12 +4 -8 xml-xerces/c/src/xercesc/internal/XMLGrammarPoolImpl.hpp
Index: XMLGrammarPoolImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLGrammarPoolImpl.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XMLGrammarPoolImpl.hpp 6 Nov 2003 21:53:52 -0000 1.11
+++ XMLGrammarPoolImpl.hpp 14 Nov 2003 22:34:20 -0000 1.12
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2003/11/14 22:34:20 neilg
+ * removed methods made unnecessary by new XSModel implementation design; thanks to
David Cargill
+ *
* Revision 1.11 2003/11/06 21:53:52 neilg
* update grammar pool interface so that cacheGrammar(Grammar) can tell the caller
whether the grammar was accepted. Also fix some documentation errors.
*
@@ -100,11 +103,6 @@
#include <xercesc/framework/XMLGrammarPool.hpp>
-// PSVI includes:
-#include <xercesc/util/ValueVectorOf.hpp>
-#include <xercesc/validators/schema/SchemaElementDecl.hpp>
-#include <xercesc/framework/psvi/XSModel.hpp>
-
XERCES_CPP_NAMESPACE_BEGIN
class XMLSynchronizedStringPool;
@@ -205,8 +203,6 @@
*/
virtual void setPSVI(const bool doPSVI);
- friend void updatePSVIvectorElemIds(ValueVectorOf<SchemaElementDecl*>*
PSVIvectorElemDecls,
- SchemaGrammar* const grammar);
//@}
// -----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
