You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by dm...@apache.org on 2004/11/08 19:17:55 UTC
cvs commit: xml-xalan/c/src/xalanc/XPathCAPI XPathCAPI.cpp
dmitryh 2004/11/08 10:17:55
Modified: c/src/xalanc/XPathCAPI XPathCAPI.cpp
Log:
Initial implementation on the pluggable memory management
Revision Changes Path
1.6 +8 -11 xml-xalan/c/src/xalanc/XPathCAPI/XPathCAPI.cpp
Index: XPathCAPI.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPathCAPI/XPathCAPI.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathCAPI.cpp 26 Feb 2004 22:41:34 -0000 1.5
+++ XPathCAPI.cpp 8 Nov 2004 18:17:55 -0000 1.6
@@ -22,12 +22,8 @@
#include <xercesc/framework/MemBufInputSource.hpp>
#include <xercesc/sax/SAXException.hpp>
-
-
#include <xalanc/Include/XalanAutoPtr.hpp>
-
-
#include <xalanc/XalanDOM/XalanDocument.hpp>
@@ -66,7 +62,7 @@
XALAN_USING_XALAN(XPathEvaluator)
XALAN_USING_XALAN(XalanSourceTreeInit)
XALAN_USING_XALAN(XalanTranscodingServices)
-
+XALAN_USING_XALAN(XalanMemMgrs)
static XalanSourceTreeInit* theSourceTreeInit = 0;
@@ -96,11 +92,11 @@
try
{
- XPathEvaluator::initialize();
+ XPathEvaluator::initialize(XalanMemMgrs::getDefaultXercesMemMgr());
try
{
- theSourceTreeInit = new XalanSourceTreeInit;
+ theSourceTreeInit = new XalanSourceTreeInit(XalanMemMgrs::getDefaultXercesMemMgr());
}
catch(...)
{
@@ -192,7 +188,7 @@
try
{
- *theHandle = new XPathEvaluator;
+ *theHandle = new XPathEvaluator(XalanMemMgrs::getDefaultXercesMemMgr());
}
catch(...)
{
@@ -334,7 +330,8 @@
XalanOutputTranscoder* const theTranscoder =
XalanTranscodingServices::makeNewTranscoder(
- XalanDOMString(theStringEncoding),
+ XalanMemMgrs::getDefaultXercesMemMgr(),
+ XalanDOMString(theStringEncoding, XalanMemMgrs::getDefaultXercesMemMgr()),
theCode,
1024);
@@ -429,7 +426,7 @@
XPathEvaluator* const theEvaluator = getEvaluator(theXalanHandle);
assert(theEvaluator != 0);
- XalanDOMString theExpressionString;
+ XalanDOMString theExpressionString(XalanMemMgrs::getDefaultXercesMemMgr());
theResult = transcodeString(
theXPathExpression,
@@ -543,7 +540,7 @@
XALAN_USING_XALAN(XalanSourceTreeParserLiaison)
XalanSourceTreeDOMSupport theDOMSupport;
- XalanSourceTreeParserLiaison theLiaison(theDOMSupport);
+ XalanSourceTreeParserLiaison theLiaison(XalanMemMgrs::getDefaultXercesMemMgr(), theDOMSupport);
// Hook the two together...
theDOMSupport.setParserLiaison(&theLiaison);
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org