peiyongz 2003/06/25 11:57:21
Modified: c/src/xercesc/internal DGXMLScanner.cpp IGXMLScanner.cpp
Log:
use new orphanGrammar()
Revision Changes Path
1.16 +6 -3 xml-xerces/c/src/xercesc/internal/DGXMLScanner.cpp
Index: DGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/DGXMLScanner.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DGXMLScanner.cpp 25 Jun 2003 17:25:33 -0000 1.15
+++ DGXMLScanner.cpp 25 Jun 2003 18:57:20 -0000 1.16
@@ -72,6 +72,7 @@
#include <xercesc/framework/XMLEntityHandler.hpp>
#include <xercesc/framework/XMLPScanToken.hpp>
#include <xercesc/framework/XMLGrammarPool.hpp>
+#include <xercesc/framework/XMLDTDDescription.hpp>
#include <xercesc/internal/EndOfEntityException.hpp>
#include <xercesc/validators/common/GrammarResolver.hpp>
#include <xercesc/validators/DTD/DocTypeHandler.hpp>
@@ -974,7 +975,8 @@
unsigned int stringId =
fGrammarResolver->getStringPool()->addOrFind(srcUsed->getSystemId());
const XMLCh* sysIdStr =
fGrammarResolver->getStringPool()->getValueForId(stringId);
- fGrammarResolver->orphanGrammar(XMLUni::fgDTDEntityString);
+ XMLDTDDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createDTDDescription(XMLUni::fgDTDEntityString);
+ fGrammarResolver->orphanGrammar(gramDesc);
fGrammarResolver->putGrammar(sysIdStr, fGrammar);
}
@@ -1698,7 +1700,8 @@
unsigned int sysId =
fGrammarResolver->getStringPool()->addOrFind(src.getSystemId());
const XMLCh* sysIdStr =
fGrammarResolver->getStringPool()->getValueForId(sysId);
- fGrammarResolver->orphanGrammar(XMLUni::fgDTDEntityString);
+ XMLDTDDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createDTDDescription(XMLUni::fgDTDEntityString);
+ fGrammarResolver->orphanGrammar(gramDesc);
fGrammarResolver->putGrammar(sysIdStr, fGrammar);
}
1.15 +6 -3 xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp
Index: IGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- IGXMLScanner.cpp 25 Jun 2003 17:25:33 -0000 1.14
+++ IGXMLScanner.cpp 25 Jun 2003 18:57:20 -0000 1.15
@@ -72,6 +72,7 @@
#include <xercesc/internal/EndOfEntityException.hpp>
#include <xercesc/framework/MemoryManager.hpp>
#include <xercesc/framework/XMLGrammarPool.hpp>
+#include <xercesc/framework/XMLDTDDescription.hpp>
#include <xercesc/validators/common/GrammarResolver.hpp>
#include <xercesc/validators/DTD/DocTypeHandler.hpp>
#include <xercesc/validators/DTD/DTDScanner.hpp>
@@ -1380,7 +1381,8 @@
unsigned int stringId =
fGrammarResolver->getStringPool()->addOrFind(srcUsed->getSystemId());
const XMLCh* sysIdStr =
fGrammarResolver->getStringPool()->getValueForId(stringId);
- fGrammarResolver->orphanGrammar(XMLUni::fgDTDEntityString);
+ XMLDTDDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createDTDDescription(XMLUni::fgDTDEntityString);
+ fGrammarResolver->orphanGrammar(gramDesc);
fGrammarResolver->putGrammar(sysIdStr, fGrammar);
}
@@ -2869,7 +2871,8 @@
unsigned int sysId =
fGrammarResolver->getStringPool()->addOrFind(src.getSystemId());
const XMLCh* sysIdStr =
fGrammarResolver->getStringPool()->getValueForId(sysId);
- fGrammarResolver->orphanGrammar(XMLUni::fgDTDEntityString);
+ XMLDTDDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createDTDDescription(XMLUni::fgDTDEntityString);
+ fGrammarResolver->orphanGrammar(gramDesc);
fGrammarResolver->putGrammar(sysIdStr, fGrammar);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
