dmitryh 2004/11/10 11:09:12
Modified: c/src/xalanc/Harness XalanFileUtility.cpp
c/src/xalanc/Include XalanMemoryManagement.hpp
XalanVector.hpp
c/src/xalanc/PlatformSupport AttributesImpl.hpp
DOMStringHelper.hpp XalanStdOutputStream.hpp
c/src/xalanc/TestXSLT process.cpp
c/src/xalanc/XMLSupport FormatterToHTML.cpp
FormatterToXML.cpp FormatterToXML.hpp
FormatterTreeWalker.hpp XMLSupportInit.hpp
c/src/xalanc/XPath ElementPrefixResolverProxy.cpp
ElementPrefixResolverProxy.hpp NodeRefList.hpp
XObjectFactoryDefault.hpp
XPathConstructionContextDefault.hpp
XPathEnvSupportDefault.hpp XPathEvaluator.cpp
XPathEvaluator.hpp XPathFactoryDefault.hpp
XPathInit.hpp XPathProcessorImpl.hpp
XalanQNameByValue.cpp
c/src/xalanc/XPathCAPI XPathCAPI.cpp
c/src/xalanc/XSLT ElemNumber.cpp TraceListenerDefault.cpp
TraceListenerDefault.hpp XSLTEngineImpl.cpp
XSLTResultTarget.hpp
c/src/xalanc/XalanDOM XalanDOMString.cpp XalanDOMString.hpp
c/src/xalanc/XalanExtensions FunctionEvaluate.cpp
c/src/xalanc/XalanSourceTree XalanSourceTreeInit.hpp
XalanSourceTreeParserLiaison.cpp
XalanSourceTreeParserLiaison.hpp
c/src/xalanc/XalanTransformer
XalanSourceTreeWrapperParsedSource.cpp
XalanSourceTreeWrapperParsedSource.hpp
XalanTransformer.cpp
XercesDOMWrapperParsedSource.cpp
XercesDOMWrapperParsedSource.hpp
c/src/xalanc/XercesParserLiaison FormatterToXercesDOM.cpp
FormatterToXercesDOM.hpp XercesDOMSupport.hpp
XercesParserLiaison.hpp
Log:
Fix for exposing interfaces with default values for copy/default constructors
and building samples
Revision Changes Path
1.4 +2 -2 xml-xalan/c/src/xalanc/Harness/XalanFileUtility.cpp
Index: XalanFileUtility.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Harness/XalanFileUtility.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanFileUtility.cpp 9 Nov 2004 16:06:04 -0000 1.3
+++ XalanFileUtility.cpp 10 Nov 2004 19:09:11 -0000 1.4
@@ -850,7 +850,7 @@
destroyObjWithMemMgr( theFormatter, theManager);
XalanSourceTreeDOMSupport domSupport;
- XalanSourceTreeParserLiaison parserLiaison(theManager, domSupport);
+ XalanSourceTreeParserLiaison parserLiaison(domSupport, theManager);
domSupport.setParserLiaison(&parserLiaison);
@@ -915,7 +915,7 @@
MemoryManagerType& theManager = XalanMemMgrs::getDefaultXercesMemMgr();
XalanSourceTreeDOMSupport domSupport;
- XalanSourceTreeParserLiaison parserLiaison(theManager, domSupport );
+ XalanSourceTreeParserLiaison parserLiaison(domSupport, theManager );
domSupport.setParserLiaison(&parserLiaison);
1.8 +13 -0 xml-xalan/c/src/xalanc/Include/XalanMemoryManagement.hpp
Index: XalanMemoryManagement.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Include/XalanMemoryManagement.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanMemoryManagement.hpp 9 Nov 2004 16:06:04 -0000 1.7
+++ XalanMemoryManagement.hpp 10 Nov 2004 19:09:11 -0000 1.8
@@ -48,6 +48,19 @@
getDefaultXercesMemMgr();
};
+
+
+
+#if defined (XALAN_DEVELOPMENT)
+#define XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR
+#define XALAN_DEFAULT_MEMMGR = XalanMemMgrs::getDummyMemMgr()
+#else
+#define XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR =
XalanMemMgrs::getDefaultXercesMemMgr()
+#define XALAN_DEFAULT_MEMMGR = XalanMemMgrs::getDefaultXercesMemMgr()
+#endif
+
+
+
template <class C>
class ConstructValueWithNoMemoryManager
{
1.11 +3 -1 xml-xalan/c/src/xalanc/Include/XalanVector.hpp
Index: XalanVector.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Include/XalanVector.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XalanVector.hpp 9 Nov 2004 16:06:04 -0000 1.10
+++ XalanVector.hpp 10 Nov 2004 19:09:11 -0000 1.11
@@ -111,7 +111,7 @@
typedef typename ConstructionTraits::Constructor Constructor;
XalanVector(
- MemoryManagerType& theManager,
+ MemoryManagerType& theManager
XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR,
size_type initialAllocation = size_type(0)) :
m_memoryManager(&theManager),
m_size(0),
@@ -1079,9 +1079,11 @@
return theLHS > theRHS ? theLHS : theRHS;
}
+#if defined(XALAN_DEVELOPMENT)
//not implemented
XalanVector(const XalanVector&);
XalanVector();
+#endif
// Data members...
MemoryManagerType* m_memoryManager;
1.7 +1 -1 xml-xalan/c/src/xalanc/PlatformSupport/AttributesImpl.hpp
Index: AttributesImpl.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/AttributesImpl.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AttributesImpl.hpp 8 Nov 2004 18:11:05 -0000 1.6
+++ AttributesImpl.hpp 10 Nov 2004 19:09:11 -0000 1.7
@@ -48,7 +48,7 @@
public:
explicit
- AttributesImpl(MemoryManagerType& theManager);
+ AttributesImpl(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
virtual
~AttributesImpl();
1.11 +14 -1
xml-xalan/c/src/xalanc/PlatformSupport/DOMStringHelper.hpp
Index: DOMStringHelper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/DOMStringHelper.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DOMStringHelper.hpp 9 Nov 2004 16:06:04 -0000 1.10
+++ DOMStringHelper.hpp 10 Nov 2004 19:09:11 -0000 1.11
@@ -65,12 +65,25 @@
#define XALAN_STATIC_UCODE_STRING(str) L##str
-
+#if !defined (XALAN_DEVELOPMENT)
+inline const XalanDOMString
+StaticStringToDOMString(const XalanDOMChar* theString)
+{
+ return XalanDOMString(theString);
+}
+#endif
#else
#define XALAN_STATIC_UCODE_STRING(str) str
+#if !defined (XALAN_DEVELOPMENT)
+inline const XalanDOMString&
+StaticStringToDOMString(const XalanDOMString& theString)
+{
+ return theString;
+}
+#endif
#endif
1.7 +1 -1
xml-xalan/c/src/xalanc/PlatformSupport/XalanStdOutputStream.hpp
Index: XalanStdOutputStream.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanStdOutputStream.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanStdOutputStream.hpp 8 Nov 2004 18:11:05 -0000 1.6
+++ XalanStdOutputStream.hpp 10 Nov 2004 19:09:11 -0000 1.7
@@ -69,7 +69,7 @@
* @param theOutputStream output stream to use
*/
XalanStdOutputStream(StreamType& theOutputStream,
- MemoryManagerType& theManager);
+ MemoryManagerType& theManager
XALAN_DEFAULT_MEMMGR);
static XalanStdOutputStream*
create( StreamType& theOutputStream,
1.12 +8 -6 xml-xalan/c/src/xalanc/TestXSLT/process.cpp
Index: process.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/TestXSLT/process.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- process.cpp 8 Nov 2004 18:11:41 -0000 1.11
+++ process.cpp 10 Nov 2004 19:09:11 -0000 1.12
@@ -606,7 +606,6 @@
FormatterToXML* const fToXML =
new FormatterToXML(
- theManager,
resultWriter,
version,
outputIndent,
@@ -616,7 +615,10 @@
doctypeSystem,
doctypePublic,
true, // xmlDecl
- standalone);
+ standalone,
+ FormatterToXML::OUTPUT_METHOD_XML,
+ true,
+ theManager);
fToXML->setShouldWriteXMLHeader(shouldWriteXMLHeader);
@@ -689,7 +691,7 @@
assert(theDocument != 0);
FormatterToXercesDOM* const fToDOM =
- new FormatterToXercesDOM( theManager,
theDocument, 0);
+ new FormatterToXercesDOM( theDocument, 0,
theManager);
fToDOM->setPrefixResolver(&prefixResolver);
@@ -740,12 +742,12 @@
params.traceSelectionEvent == true)
{
return new TraceListenerDefault(
- theManager,
diagnosticsWriter,
params.traceTemplates,
params.traceTemplateChildren,
params.traceGenerationEvent,
- params.traceSelectionEvent);
+ params.traceSelectionEvent,
+ theManager);
}
else
{
@@ -824,7 +826,7 @@
XalanSourceTreeInit
theXalanSourceTreeInit(theManager);
XalanSourceTreeDOMSupport theXalanSourceTreeDOMSupport;
- XalanSourceTreeParserLiaison
theXalanSourceTreeParserLiaison(theManager, theXalanSourceTreeDOMSupport);
+ XalanSourceTreeParserLiaison
theXalanSourceTreeParserLiaison(theXalanSourceTreeDOMSupport, theManager);
// Hookup the parser liaison instance to the support instance.
theXalanSourceTreeDOMSupport.setParserLiaison(
&theXalanSourceTreeParserLiaison);
1.8 +3 -2 xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.cpp
Index: FormatterToHTML.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FormatterToHTML.cpp 8 Nov 2004 18:14:35 -0000 1.7
+++ FormatterToHTML.cpp 10 Nov 2004 19:09:11 -0000 1.8
@@ -69,7 +69,6 @@
bool escapeURLs,
bool omitMetaTag) :
FormatterToXML(
- theManager,
writer,
s_emptyString,
doIndent,
@@ -80,7 +79,9 @@
doctypePublic,
false,
s_emptyString,
- OUTPUT_METHOD_HTML),
+ OUTPUT_METHOD_HTML,
+ true,
+ theManager),
m_currentElementName(theManager),
m_inBlockElem(false),
m_isRawStack(theManager),
1.12 +5 -5 xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML.cpp
Index: FormatterToXML.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FormatterToXML.cpp 8 Nov 2004 18:14:35 -0000 1.11
+++ FormatterToXML.cpp 10 Nov 2004 19:09:11 -0000 1.12
@@ -55,7 +55,6 @@
FormatterToXML::FormatterToXML(
- MemoryManagerType& theManager,
Writer& writer,
const XalanDOMString& version,
bool doIndent,
@@ -67,7 +66,8 @@
bool xmlDecl,
const XalanDOMString& standalone,
eFormat format,
- bool fBufferData) :
+ bool fBufferData,
+ MemoryManagerType& theManager) :
FormatterListener(format),
m_writer(&writer),
m_stream(m_writer->getStream()),
@@ -334,8 +334,7 @@
ThisType* theResult = theGuard.get();
- new (theResult) ThisType( theManager,
- writer,
+ new (theResult) ThisType( writer,
version,
doIndent ,
indent ,
@@ -346,7 +345,8 @@
xmlDecl ,
standalone ,
format,
- fBufferData);
+ fBufferData,
+ theManager);
theGuard.release();
1.8 +2 -2 xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML.hpp
Index: FormatterToXML.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FormatterToXML.hpp 8 Nov 2004 18:14:35 -0000 1.7
+++ FormatterToXML.hpp 10 Nov 2004 19:09:11 -0000 1.8
@@ -85,7 +85,6 @@
* @param fBufferData If true, data will be buffered in the
formatter
*/
FormatterToXML(
- MemoryManagerType& theManager,
Writer& writer,
const XalanDOMString& version =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
bool doIndent =
false,
@@ -97,7 +96,8 @@
bool xmlDecl = true,
const XalanDOMString& standalone =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
eFormat format =
OUTPUT_METHOD_XML,
- bool fBufferData =
true);
+ bool fBufferData =
true,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
static FormatterToXML*
create(
1.5 +1 -1 xml-xalan/c/src/xalanc/XMLSupport/FormatterTreeWalker.hpp
Index: FormatterTreeWalker.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterTreeWalker.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FormatterTreeWalker.hpp 8 Nov 2004 18:14:35 -0000 1.4
+++ FormatterTreeWalker.hpp 10 Nov 2004 19:09:11 -0000 1.5
@@ -46,7 +46,7 @@
* (toXMLString, digest, ...)
*/
FormatterTreeWalker(FormatterListener& formatterListener,
- MemoryManagerType& theManager);
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
virtual
~FormatterTreeWalker();
1.6 +1 -1 xml-xalan/c/src/xalanc/XMLSupport/XMLSupportInit.hpp
Index: XMLSupportInit.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/XMLSupportInit.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLSupportInit.hpp 8 Nov 2004 18:14:35 -0000 1.5
+++ XMLSupportInit.hpp 10 Nov 2004 19:09:11 -0000 1.6
@@ -41,7 +41,7 @@
public:
explicit
- XMLSupportInit(MemoryManagerType& theManager);
+ XMLSupportInit(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
~XMLSupportInit();
1.6 +3 -3
xml-xalan/c/src/xalanc/XPath/ElementPrefixResolverProxy.cpp
Index: ElementPrefixResolverProxy.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XPath/ElementPrefixResolverProxy.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElementPrefixResolverProxy.cpp 8 Nov 2004 18:17:11 -0000 1.5
+++ ElementPrefixResolverProxy.cpp 10 Nov 2004 19:09:11 -0000 1.6
@@ -40,10 +40,10 @@
ElementPrefixResolverProxy::ElementPrefixResolverProxy(
- MemoryManagerType& theManager,
const XalanElement* namespaceContext,
const XPathEnvSupport& envSupport,
- const DOMSupport& /* domSupport */) :
+ const DOMSupport& /* domSupport */,
+ MemoryManagerType& theManager) :
m_namespaceContext(namespaceContext),
m_envSupport(&envSupport),
m_uri(theManager)
@@ -53,8 +53,8 @@
ElementPrefixResolverProxy::ElementPrefixResolverProxy(
- MemoryManagerType& theManager,
const XalanElement* namespaceContext,
+ MemoryManagerType& theManager,
const XPathEnvSupport* envSupport) :
m_namespaceContext(namespaceContext),
m_envSupport(envSupport),
1.6 +3 -3
xml-xalan/c/src/xalanc/XPath/ElementPrefixResolverProxy.hpp
Index: ElementPrefixResolverProxy.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XPath/ElementPrefixResolverProxy.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElementPrefixResolverProxy.hpp 8 Nov 2004 18:17:11 -0000 1.5
+++ ElementPrefixResolverProxy.hpp 10 Nov 2004 19:09:11 -0000 1.6
@@ -56,10 +56,10 @@
* @deprecated
*/
ElementPrefixResolverProxy(
- MemoryManagerType& theManager,
const XalanElement* namespaceContext,
const XPathEnvSupport& envSupport,
- const DOMSupport& domSupport);
+ const DOMSupport& domSupport,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
/**
* Construct an instance of an element prefix resolver proxy.
@@ -69,8 +69,8 @@
*
*/
ElementPrefixResolverProxy(
- MemoryManagerType& theManager,
const XalanElement* namespaceContext,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR,
const XPathEnvSupport* envSupport = 0);
virtual
1.7 +10 -5 xml-xalan/c/src/xalanc/XPath/NodeRefList.hpp
Index: NodeRefList.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/NodeRefList.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NodeRefList.hpp 8 Nov 2004 18:17:11 -0000 1.6
+++ NodeRefList.hpp 10 Nov 2004 19:09:11 -0000 1.7
@@ -43,14 +43,14 @@
public:
explicit
- NodeRefList(MemoryManagerType& theManager);
+ NodeRefList(MemoryManagerType& theManager
XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
/**
* Construct a node list from another
*
* @param theSource source node list
*/
- NodeRefList(const NodeRefList& theSource, MemoryManagerType&
theManager);
+ NodeRefList(const NodeRefList& theSource, MemoryManagerType&
theManager XALAN_DEFAULT_MEMMGR);
MemoryManagerType&
getMemoryManager()
@@ -64,7 +64,7 @@
* @param theSource source node list
*/
explicit
- NodeRefList(const NodeRefListBase& theSource, MemoryManagerType&
theManager);
+ NodeRefList(const NodeRefListBase& theSource, MemoryManagerType&
theManager XALAN_DEFAULT_MEMMGR);
virtual
~NodeRefList();
@@ -107,8 +107,7 @@
}
protected:
- //undefined
- NodeRefList(const NodeRefList& theSource);
+
// Default vector allocation size. It seems high, but
// it's really worth it...
enum
@@ -130,6 +129,12 @@
}
NodeListVectorType m_nodeList;
+private:
+#if defined (XALAN_DEVELOPMENT)
+ // not defined
+ NodeRefList();
+ NodeRefList(const NodeRefList& theSource);
+#endif
};
1.9 +1 -1 xml-xalan/c/src/xalanc/XPath/XObjectFactoryDefault.hpp
Index: XObjectFactoryDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XObjectFactoryDefault.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XObjectFactoryDefault.hpp 8 Nov 2004 18:17:12 -0000 1.8
+++ XObjectFactoryDefault.hpp 10 Nov 2004 19:09:11 -0000 1.9
@@ -82,7 +82,7 @@
*/
explicit
XObjectFactoryDefault(
- MemoryManagerType& theManager,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR,
size_type theXStringBlockSize =
eDefaultXStringBlockSize,
size_type theXNumberBlockSize =
eDefaultXNumberBlockSize,
size_type theXNodeSetBlockSize =
eDefaultXNodeSetBlockSize,
1.7 +1 -1
xml-xalan/c/src/xalanc/XPath/XPathConstructionContextDefault.hpp
Index: XPathConstructionContextDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XPath/XPathConstructionContextDefault.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XPathConstructionContextDefault.hpp 8 Nov 2004 18:17:12 -0000
1.6
+++ XPathConstructionContextDefault.hpp 10 Nov 2004 19:09:11 -0000
1.7
@@ -53,7 +53,7 @@
/*
* Construct an instance.
*/
- XPathConstructionContextDefault(MemoryManagerType& theManager);
+ XPathConstructionContextDefault(MemoryManagerType& theManager
XALAN_DEFAULT_MEMMGR);
static XPathConstructionContextDefault*
create(MemoryManagerType& theManager);
1.9 +1 -1 xml-xalan/c/src/xalanc/XPath/XPathEnvSupportDefault.hpp
Index: XPathEnvSupportDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XPathEnvSupportDefault.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XPathEnvSupportDefault.hpp 8 Nov 2004 18:17:12 -0000 1.8
+++ XPathEnvSupportDefault.hpp 10 Nov 2004 19:09:11 -0000 1.9
@@ -62,7 +62,7 @@
terminate();
- XPathEnvSupportDefault(MemoryManagerType& theManager);
+ XPathEnvSupportDefault(MemoryManagerType& theManager
XALAN_DEFAULT_MEMMGR);
virtual
~XPathEnvSupportDefault();
1.6 +4 -4 xml-xalan/c/src/xalanc/XPath/XPathEvaluator.cpp
Index: XPathEvaluator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XPathEvaluator.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathEvaluator.cpp 8 Nov 2004 18:17:12 -0000 1.5
+++ XPathEvaluator.cpp 10 Nov 2004 19:09:11 -0000 1.6
@@ -275,7 +275,7 @@
domSupport,
contextNode,
xpathString,
- ElementPrefixResolverProxy(m_memoryManager,
namespaceNode, theEnvSupportDefault, domSupport),
+ ElementPrefixResolverProxy(namespaceNode,
theEnvSupportDefault, domSupport, m_memoryManager),
theEnvSupportDefault);
}
@@ -295,7 +295,7 @@
domSupport,
contextNode,
xpath,
- ElementPrefixResolverProxy(m_memoryManager,
namespaceNode, theEnvSupportDefault, domSupport),
+ ElementPrefixResolverProxy(namespaceNode,
theEnvSupportDefault, domSupport, m_memoryManager),
theEnvSupportDefault);
}
@@ -345,7 +345,7 @@
DOMSupportDefault theDOMSupport(m_memoryManager);
XPathEnvSupportDefault theEnvSupportDefault(m_memoryManager);
- return createXPath(xpathString,
ElementPrefixResolverProxy(m_memoryManager, 0, theEnvSupportDefault,
theDOMSupport));
+ return createXPath(xpathString, ElementPrefixResolverProxy(0,
theEnvSupportDefault, theDOMSupport, m_memoryManager));
}
@@ -358,7 +358,7 @@
{
XPathEnvSupportDefault theEnvSupportDefault(m_memoryManager);
- return createXPath(xpathString,
ElementPrefixResolverProxy(m_memoryManager, namespaceNode,
theEnvSupportDefault, domSupport));
+ return createXPath(xpathString, ElementPrefixResolverProxy(
namespaceNode, theEnvSupportDefault, domSupport, m_memoryManager));
}
1.6 +2 -2 xml-xalan/c/src/xalanc/XPath/XPathEvaluator.hpp
Index: XPathEvaluator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XPathEvaluator.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathEvaluator.hpp 8 Nov 2004 18:17:12 -0000 1.5
+++ XPathEvaluator.hpp 10 Nov 2004 19:09:11 -0000 1.6
@@ -72,7 +72,7 @@
// it once, unless you have called terminate previously, and
// you want to re-initialize the library.
static void
- initialize(MemoryManagerType& theManager);
+ initialize(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
// Static terminator to be called after all instances
// are destroyed. The call is _not_ thread-safe. Once
@@ -82,7 +82,7 @@
terminate();
- XPathEvaluator(MemoryManagerType& theManager);
+ XPathEvaluator(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
~XPathEvaluator();
1.7 +1 -1 xml-xalan/c/src/xalanc/XPath/XPathFactoryDefault.hpp
Index: XPathFactoryDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XPathFactoryDefault.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XPathFactoryDefault.hpp 8 Nov 2004 18:17:12 -0000 1.6
+++ XPathFactoryDefault.hpp 10 Nov 2004 19:09:11 -0000 1.7
@@ -42,7 +42,7 @@
public:
explicit
- XPathFactoryDefault(MemoryManagerType& theManager);
+ XPathFactoryDefault(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
virtual
~XPathFactoryDefault();
1.6 +1 -1 xml-xalan/c/src/xalanc/XPath/XPathInit.hpp
Index: XPathInit.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XPathInit.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathInit.hpp 8 Nov 2004 18:17:12 -0000 1.5
+++ XPathInit.hpp 10 Nov 2004 19:09:11 -0000 1.6
@@ -41,7 +41,7 @@
public:
explicit
- XPathInit(MemoryManagerType& theManager);
+ XPathInit(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
static XPathInit*
create(MemoryManagerType& theManager);
1.12 +1 -1 xml-xalan/c/src/xalanc/XPath/XPathProcessorImpl.hpp
Index: XPathProcessorImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XPathProcessorImpl.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XPathProcessorImpl.hpp 9 Nov 2004 22:38:01 -0000 1.11
+++ XPathProcessorImpl.hpp 10 Nov 2004 19:09:11 -0000 1.12
@@ -66,7 +66,7 @@
typedef XalanVector<bool> BoolVectorType;
- XPathProcessorImpl(MemoryManagerType& theManager);
+ XPathProcessorImpl(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
virtual
~XPathProcessorImpl();
1.8 +1 -1 xml-xalan/c/src/xalanc/XPath/XalanQNameByValue.cpp
Index: XalanQNameByValue.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XalanQNameByValue.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanQNameByValue.cpp 8 Nov 2004 18:17:11 -0000 1.7
+++ XalanQNameByValue.cpp 10 Nov 2004 19:09:11 -0000 1.8
@@ -148,7 +148,7 @@
m_namespace(theManager),
m_localpart(theManager)
{
- ElementPrefixResolverProxy theProxy(theManager, namespaceContext,
envSupport, domSupport);
+ ElementPrefixResolverProxy theProxy( namespaceContext, envSupport,
domSupport, theManager);
resolvePrefix(
c_wstr(qname),
1.7 +1 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XPathCAPI.cpp 8 Nov 2004 18:17:55 -0000 1.6
+++ XPathCAPI.cpp 10 Nov 2004 19:09:11 -0000 1.7
@@ -540,7 +540,7 @@
XALAN_USING_XALAN(XalanSourceTreeParserLiaison)
XalanSourceTreeDOMSupport theDOMSupport;
- XalanSourceTreeParserLiaison
theLiaison(XalanMemMgrs::getDefaultXercesMemMgr(), theDOMSupport);
+ XalanSourceTreeParserLiaison
theLiaison(theDOMSupport, XalanMemMgrs::getDefaultXercesMemMgr());
// Hook the two together...
theDOMSupport.setParserLiaison(&theLiaison);
1.16 +2 -2 xml-xalan/c/src/xalanc/XSLT/ElemNumber.cpp
Index: ElemNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemNumber.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ElemNumber.cpp 8 Nov 2004 18:18:56 -0000 1.15
+++ ElemNumber.cpp 10 Nov 2004 19:09:11 -0000 1.16
@@ -381,7 +381,7 @@
#else
static_cast<const
XalanElement*>(contextNode);
#endif
- const ElementPrefixResolverProxy
theProxy(executionContext.getMemoryManager(), theElement);
+ const ElementPrefixResolverProxy
theProxy( theElement, executionContext.getMemoryManager());
countMatchPattern =
executionContext.createMatchPattern(theNodeName, theProxy);
@@ -430,7 +430,7 @@
const XalanDOMString& theNodeName =
theAttribute->getNodeName();
- const ElementPrefixResolverProxy
theProxy(executionContext.getMemoryManager(),theAttribute->getOwnerElement());
+ const ElementPrefixResolverProxy
theProxy(theAttribute->getOwnerElement(), executionContext.getMemoryManager());
StylesheetExecutionContext::GetAndReleaseCachedString
theMatchPatternString(executionContext);
1.12 +2 -2 xml-xalan/c/src/xalanc/XSLT/TraceListenerDefault.cpp
Index: TraceListenerDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/TraceListenerDefault.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TraceListenerDefault.cpp 8 Nov 2004 18:18:56 -0000 1.11
+++ TraceListenerDefault.cpp 10 Nov 2004 19:09:11 -0000 1.12
@@ -49,12 +49,12 @@
TraceListenerDefault::TraceListenerDefault(
- MemoryManagerType& theManager,
PrintWriter& thePrintWriter,
bool traceTemplates,
bool traceElements,
bool traceGeneration,
- bool traceSelection) :
+ bool traceSelection,
+ MemoryManagerType& theManager) :
m_printWriter(thePrintWriter),
m_traceTemplates(traceTemplates),
m_traceElements(traceElements),
1.7 +2 -2 xml-xalan/c/src/xalanc/XSLT/TraceListenerDefault.hpp
Index: TraceListenerDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/TraceListenerDefault.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TraceListenerDefault.hpp 8 Nov 2004 18:18:56 -0000 1.6
+++ TraceListenerDefault.hpp 10 Nov 2004 19:09:11 -0000 1.7
@@ -44,12 +44,12 @@
public:
TraceListenerDefault(
- MemoryManagerType& theManager,
PrintWriter& thePrintWriter,
bool traceTemplates = false,
bool traceElements = false,
bool traceGeneration = false,
- bool traceSelection = false);
+ bool traceSelection = false,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
virtual
~TraceListenerDefault();
1.22 +4 -4 xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.cpp
Index: XSLTEngineImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XSLTEngineImpl.cpp 9 Nov 2004 16:06:06 -0000 1.21
+++ XSLTEngineImpl.cpp 10 Nov 2004 19:09:11 -0000 1.22
@@ -739,7 +739,7 @@
ds += fragID;
ds +=
XalanDOMString(XALAN_STATIC_UCODE_STRING(")"),getMemoryManager());
- ElementPrefixResolverProxy theProxy(
getMemoryManager(), nsNode, m_xpathEnvSupport, m_domSupport);
+ ElementPrefixResolverProxy theProxy( nsNode,
m_xpathEnvSupport, m_domSupport, getMemoryManager());
XPathExecutionContextDefault
theExecutionContext(m_xpathEnvSupport,
m_domSupport,
@@ -2954,10 +2954,10 @@
const XalanElement& prefixResolver,
XPathExecutionContext& executionContext)
{
- ElementPrefixResolverProxy
theProxy(executionContext.getMemoryManager(),
- &prefixResolver,
+ ElementPrefixResolverProxy theProxy(&prefixResolver,
m_xpathEnvSupport,
-
m_domSupport);
+
m_domSupport,
+
executionContext.getMemoryManager());
return evalXPathStr(str, contextNode, theProxy, executionContext);
}
1.10 +13 -10 xml-xalan/c/src/xalanc/XSLT/XSLTResultTarget.hpp
Index: XSLTResultTarget.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/XSLTResultTarget.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XSLTResultTarget.hpp 9 Nov 2004 16:06:06 -0000 1.9
+++ XSLTResultTarget.hpp 10 Nov 2004 19:09:11 -0000 1.10
@@ -60,7 +60,7 @@
explicit
- XSLTResultTarget(MemoryManagerType& theManager);
+ XSLTResultTarget(MemoryManagerType& theManager
XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
/**
* Create a new output target with a file name.
@@ -68,7 +68,7 @@
* @param fileName valid system file name
*/
XSLTResultTarget(const XalanDOMString& fileName,
- MemoryManagerType& theManager);
+ MemoryManagerType& theManager
XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
/**
* Create a new output target with a file name.
@@ -76,7 +76,7 @@
* @param fileName valid system file name
*/
XSLTResultTarget(const XalanDOMChar* fileName,
- MemoryManagerType& theManager);
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
/**
* Create a new output target with a file name.
@@ -84,7 +84,7 @@
* @param fileName valid system file name
*/
XSLTResultTarget(const char* fileName,
- MemoryManagerType& theManager);
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
/**
* Create a new output target with a stream.
@@ -92,7 +92,7 @@
* @param byteStream a pointer to a std ostream for the output
*/
XSLTResultTarget(StreamType* theStream,
- MemoryManagerType& theManager);
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
/**
* Create a new output target with a stream.
@@ -100,7 +100,7 @@
* @param byteStream a reference to a std ostream for the output
*/
XSLTResultTarget(StreamType& theStream,
- MemoryManagerType& theManager);
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
/**
* Create a new output target with a character stream.
@@ -109,7 +109,7 @@
* will be written
*/
XSLTResultTarget(Writer* characterStream,
- MemoryManagerType& theManager);
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
/**
* Create a new output target with a stream.
@@ -118,7 +118,7 @@
* will be written
*/
XSLTResultTarget(FILE* characterStream,
- MemoryManagerType& theManager);
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
/**
* Create a new output target with a FormatterListener.
@@ -126,10 +126,10 @@
* @param flistener A FormatterListener instance for result tree events.
*/
XSLTResultTarget(FormatterListener& flistener,
- MemoryManagerType& theManager);
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
XSLTResultTarget(const XSLTResultTarget& other,
- MemoryManagerType& theManager);
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
~XSLTResultTarget();
/**
@@ -304,7 +304,10 @@
private:
+#if defined(XALAN_DEVELOPMENT)
+ XSLTResultTarget();
XSLTResultTarget(const XSLTResultTarget&);
+#endif
XalanDOMString m_fileName;
1.13 +3 -1 xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.cpp
Index: XalanDOMString.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XalanDOMString.cpp 9 Nov 2004 16:06:07 -0000 1.12
+++ XalanDOMString.cpp 10 Nov 2004 19:09:12 -0000 1.13
@@ -979,9 +979,11 @@
XalanMemMngArrayAllocate<wchar_t>::allocate(
theSourceStringLength + 1, theTargetVector.getMemoryManager()),
theSourceStringLength + 1);
+ typedef XalanMemMgrAutoPtrArray<wchar_t>::size_type size_type;
+
for (size_t index = 0; index < theSourceStringLength;
++index)
{
- theTempSourceJanitor[index] =
wchar_t(theSourceString[index]);
+ theTempSourceJanitor[size_type(index)] =
wchar_t(theSourceString[index]);
}
theTempSourceJanitor[theSourceStringLength] = 0;
1.12 +65 -7 xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.hpp
Index: XalanDOMString.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XalanDOMString.hpp 9 Nov 2004 16:06:08 -0000 1.11
+++ XalanDOMString.hpp 10 Nov 2004 19:09:12 -0000 1.12
@@ -63,31 +63,30 @@
enum { npos = -1 };
#endif
- XalanDOMString(MemoryManagerType& theManager);
-
+ XalanDOMString(MemoryManagerType& theManager
XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR );
explicit
XalanDOMString(
const char* theString,
- MemoryManagerType& theManager,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR,
size_type theCount = size_type(npos));
XalanDOMString(
const XalanDOMString& theSource,
- MemoryManagerType& theManager,
+ MemoryManagerType& theManager
XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR,
size_type
theStartPosition = 0,
size_type theCount =
size_type(npos));
explicit
XalanDOMString(
const XalanDOMChar* theString,
- MemoryManagerType& theManager,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR,
size_type theCount =
size_type(npos));
XalanDOMString(
size_type theCount,
XalanDOMChar theChar,
- MemoryManagerType& theManager);
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
XalanDOMString*
clone(MemoryManagerType& theManager);
@@ -782,10 +781,13 @@
return m_data.begin() + thePosition;
}
-private:
+#if defined (XALAN_DEVELOPMENT)
// not defined
XalanDOMString();
XalanDOMString(const XalanDOMString&);
+#endif
+
+private:
XalanDOMCharVectorType m_data;
@@ -955,6 +957,25 @@
bool
terminate = false);
/**
+ * Convert a string to a XalanDOMString, transcoding from
+ * the default local code page.
+ *
+ * @param theSourceString The source string
+ * @param theSourceStringLength The source string length.
+ * @return The new string.
+ */
+#if !defined(XALAN_DEVELOPMENT)
+inline const XalanDOMString
+TranscodeFromLocalCodePage(
+ const char*
theSourceString,
+ XalanDOMString::size_type theSourceStringLength =
XalanDOMString::npos)
+{
+ return
XalanDOMString(theSourceString,XalanMemMgrs::getDefaultXercesMemMgr(),
theSourceStringLength);
+}
+#endif
+
+
+/**
* Convert a XalanDOMChar string to C++ standard library
* vector, transcoding to the default local code
* page. The string _must_ be null-terminated.
@@ -970,7 +991,25 @@
CharVectorType& targetVector,
bool terminate =
false);
+/**
+ * Convert XalanDOMString to C++ standard library
+ * vector, transcoding to the default local code
+ * page. Null-terminate the sttring...
+ *
+ * @param theSourceString source string
+ * @return The transcoded string.
+ */
+#if !defined(XALAN_DEVELOPMENT)
+inline const CharVectorType
+TranscodeToLocalCodePage(const XalanDOMChar* theSourceString)
+{
+ CharVectorType theResult;
+
+ TranscodeToLocalCodePage(theSourceString, theResult, true);
+ return theResult;
+}
+#endif
/**
@@ -993,6 +1032,25 @@
+/**
+ * Convert XalanDOMString to C++ standard library
+ * vector, transcoding to the default local code
+ * page.
+ *
+ * @param thetheSourceString source string
+ * @return The transcoded string.
+ */
+#if !defined(XALAN_DEVELOPMENT)
+inline const CharVectorType
+TranscodeToLocalCodePage(const XalanDOMString& theSourceString)
+{
+ CharVectorType theResult;
+
+ TranscodeToLocalCodePage(theSourceString, theResult, true);
+
+ return theResult;
+}
+#endif
/**
1.8 +4 -4
xml-xalan/c/src/xalanc/XalanExtensions/FunctionEvaluate.cpp
Index: FunctionEvaluate.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanExtensions/FunctionEvaluate.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionEvaluate.cpp 8 Nov 2004 19:22:07 -0000 1.7
+++ FunctionEvaluate.cpp 10 Nov 2004 19:09:12 -0000 1.8
@@ -93,11 +93,11 @@
assert(resolver == 0 || resolver->getNodeType() ==
XalanNode::ELEMENT_NODE);
#if defined(XALAN_OLD_STYLE_CASTS)
- ElementPrefixResolverProxy
theProxy(executionContext.getMemoryManager(),
- (const XalanElement*)resolver);
+ ElementPrefixResolverProxy theProxy((const XalanElement*)resolver,
+
executionContext.getMemoryManager());
#else
- ElementPrefixResolverProxy
theProxy(executionContext.getMemoryManager(),
- static_cast<const
XalanElement*>(resolver));
+ ElementPrefixResolverProxy theProxy(static_cast<const
XalanElement*>(resolver),
+
executionContext.getMemoryManager());
#endif
return doExecute(executionContext, context, expression, theProxy,
locator);
1.6 +1 -1
xml-xalan/c/src/xalanc/XalanSourceTree/XalanSourceTreeInit.hpp
Index: XalanSourceTreeInit.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanSourceTree/XalanSourceTreeInit.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanSourceTreeInit.hpp 8 Nov 2004 19:15:38 -0000 1.5
+++ XalanSourceTreeInit.hpp 10 Nov 2004 19:09:12 -0000 1.6
@@ -51,7 +51,7 @@
public:
explicit
- XalanSourceTreeInit(MemoryManagerType& theManager);
+ XalanSourceTreeInit(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
~XalanSourceTreeInit();
1.7 +2 -2
xml-xalan/c/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.cpp
Index: XalanSourceTreeParserLiaison.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanSourceTreeParserLiaison.cpp 8 Nov 2004 19:15:38 -0000 1.6
+++ XalanSourceTreeParserLiaison.cpp 10 Nov 2004 19:09:12 -0000 1.7
@@ -453,8 +453,8 @@
XalanSourceTreeParserLiaison::XalanSourceTreeParserLiaison(
- MemoryManagerType& theManager,
- XalanSourceTreeDOMSupport& /* theSupport */) :
+ XalanSourceTreeDOMSupport& /* theSupport */,
+ MemoryManagerType& theManager) :
m_xercesParserLiaison(theManager),
m_documentMap(theManager),
m_poolAllText(true)
1.9 +3 -3
xml-xalan/c/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.hpp
Index: XalanSourceTreeParserLiaison.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XalanSourceTreeParserLiaison.hpp 8 Nov 2004 19:15:38 -0000 1.8
+++ XalanSourceTreeParserLiaison.hpp 10 Nov 2004 19:09:12 -0000 1.9
@@ -66,13 +66,13 @@
*
* @deprecated This constructor is deprecated. Use the next
constructor instead.
*/
- XalanSourceTreeParserLiaison(MemoryManagerType& theManager,
- XalanSourceTreeDOMSupport&
theSupport);
+ XalanSourceTreeParserLiaison( XalanSourceTreeDOMSupport&
theSupport,
+ MemoryManagerType& theManager
XALAN_DEFAULT_MEMMGR);
/**
* Construct a XalanSourceTreeParserLiaison instance.
*/
- XalanSourceTreeParserLiaison(MemoryManagerType& theManager);
+ XalanSourceTreeParserLiaison(MemoryManagerType& theManager
XALAN_DEFAULT_MEMMGR);
MemoryManagerType&
getMemoryManager()
1.6 +2 -2
xml-xalan/c/src/xalanc/XalanTransformer/XalanSourceTreeWrapperParsedSource.cpp
Index: XalanSourceTreeWrapperParsedSource.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XalanSourceTreeWrapperParsedSource.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanSourceTreeWrapperParsedSource.cpp 8 Nov 2004 19:20:04 -0000
1.5
+++ XalanSourceTreeWrapperParsedSource.cpp 10 Nov 2004 19:09:12 -0000
1.6
@@ -36,11 +36,11 @@
XalanSourceTreeWrapperParsedSource::XalanSourceTreeWrapperParsedSource(
- MemoryManagerType& theManager,
XalanSourceTreeDocument* theDocument,
XalanSourceTreeParserLiaison& theParserLiaison,
XalanSourceTreeDOMSupport& theDOMSupport,
- const XalanDOMString& theURI) :
+ const XalanDOMString& theURI,
+ MemoryManagerType& theManager) :
XalanParsedSource(),
m_parserLiaison(theParserLiaison),
m_domSupport(theDOMSupport),
1.6 +2 -2
xml-xalan/c/src/xalanc/XalanTransformer/XalanSourceTreeWrapperParsedSource.hpp
Index: XalanSourceTreeWrapperParsedSource.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XalanSourceTreeWrapperParsedSource.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanSourceTreeWrapperParsedSource.hpp 8 Nov 2004 19:20:04 -0000
1.5
+++ XalanSourceTreeWrapperParsedSource.hpp 10 Nov 2004 19:09:12 -0000
1.6
@@ -51,11 +51,11 @@
public:
XalanSourceTreeWrapperParsedSource(
- MemoryManagerType& theManager,
XalanSourceTreeDocument* theDocument,
XalanSourceTreeParserLiaison& theParserLiaison,
XalanSourceTreeDOMSupport& theDOMSupport,
- const XalanDOMString& theURI =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()));
+ const XalanDOMString& theURI =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
virtual
~XalanSourceTreeWrapperParsedSource();
1.20 +1 -1
xml-xalan/c/src/xalanc/XalanTransformer/XalanTransformer.cpp
Index: XalanTransformer.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XalanTransformer.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XalanTransformer.cpp 9 Nov 2004 16:06:08 -0000 1.19
+++ XalanTransformer.cpp 10 Nov 2004 19:09:12 -0000 1.20
@@ -500,7 +500,7 @@
// Create some support objects that are necessary for running
the processor...
XalanSourceTreeDOMSupport theDOMSupport;
- XalanSourceTreeParserLiaison
theParserLiaison(m_memoryManager, theDOMSupport);
+ XalanSourceTreeParserLiaison theParserLiaison(theDOMSupport,
m_memoryManager);
theParserLiaison.setEntityResolver(m_entityResolver);
theParserLiaison.setErrorHandler(m_errorHandler);
1.8 +5 -5
xml-xalan/c/src/xalanc/XalanTransformer/XercesDOMWrapperParsedSource.cpp
Index: XercesDOMWrapperParsedSource.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XercesDOMWrapperParsedSource.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesDOMWrapperParsedSource.cpp 8 Nov 2004 19:20:05 -0000 1.7
+++ XercesDOMWrapperParsedSource.cpp 10 Nov 2004 19:09:12 -0000 1.8
@@ -39,11 +39,11 @@
#if defined(XALAN_BUILD_DEPRECATED_DOM_BRIDGE)
XercesDOMWrapperParsedSource::XercesDOMWrapperParsedSource(
- MemoryManagerType& theManager,
const DOM_Document_Type& theDocument,
XercesParserLiaison& theParserLiaison,
XercesDOMSupport& theDOMSupport,
- const XalanDOMString& theURI) :
+ const XalanDOMString& theURI,
+ MemoryManagerType& theManager) :
XalanParsedSource(),
m_parserLiaison(theParserLiaison),
m_domSupport(theDOMSupport),
@@ -61,11 +61,11 @@
XercesDOMWrapperParsedSource::XercesDOMWrapperParsedSource(
- MemoryManagerType& theManager,
- const DOMDocument_Type* theDocument,
+ const DOMDocument_Type* theDocument,
XercesParserLiaison& theParserLiaison,
XercesDOMSupport& theDOMSupport,
- const XalanDOMString& theURI) :
+ const XalanDOMString& theURI,
+ MemoryManagerType& theManager) :
XalanParsedSource(),
m_parserLiaison(theParserLiaison),
m_domSupport(theDOMSupport),
1.7 +4 -4
xml-xalan/c/src/xalanc/XalanTransformer/XercesDOMWrapperParsedSource.hpp
Index: XercesDOMWrapperParsedSource.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XercesDOMWrapperParsedSource.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesDOMWrapperParsedSource.hpp 8 Nov 2004 19:20:05 -0000 1.6
+++ XercesDOMWrapperParsedSource.hpp 10 Nov 2004 19:09:12 -0000 1.7
@@ -71,11 +71,11 @@
* @deprecated This constructor is deprecated.
*/
XercesDOMWrapperParsedSource(
- MemoryManagerType& theManager,
const DOM_Document_Type& theDocument,
XercesParserLiaison& theParserLiaison,
XercesDOMSupport& theDOMSupport,
- const XalanDOMString& theURI =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()));
+ const XalanDOMString& theURI =
XalanDOMString(XalanMemMgrs::getDummyMemMgr())
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
#endif
/**
@@ -87,11 +87,11 @@
* @param theURI The URI of the document, if any.
*/
XercesDOMWrapperParsedSource(
- MemoryManagerType& theManager,
const DOMDocument_Type* theDocument,
XercesParserLiaison& theParserLiaison,
XercesDOMSupport& theDOMSupport,
- const XalanDOMString& theURI =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()));
+ const XalanDOMString& theURI =
XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
virtual
~XercesDOMWrapperParsedSource();
1.6 +5 -5
xml-xalan/c/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp
Index: FormatterToXercesDOM.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FormatterToXercesDOM.cpp 8 Nov 2004 18:13:57 -0000 1.5
+++ FormatterToXercesDOM.cpp 10 Nov 2004 19:09:12 -0000 1.6
@@ -62,11 +62,11 @@
-FormatterToXercesDOM::FormatterToXercesDOM(
- MemoryManagerType& theManager,
+FormatterToXercesDOM::FormatterToXercesDOM(
DOMDocument_Type* doc,
DOMDocumentFragmentType* docFrag,
- DOMElementType* currentElement)
:
+ DOMElementType* currentElement,
+ MemoryManagerType& theManager) :
FormatterListener(OUTPUT_METHOD_DOM),
m_doc(doc),
m_docFrag(docFrag),
@@ -81,9 +81,9 @@
FormatterToXercesDOM::FormatterToXercesDOM(
- MemoryManagerType& theManager,
DOMDocument_Type* doc,
- DOMElementType* elem) :
+ DOMElementType* elem,
+ MemoryManagerType& theManager) :
FormatterListener(OUTPUT_METHOD_DOM),
m_doc(doc),
m_docFrag(0),
1.8 +4 -4
xml-xalan/c/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp
Index: FormatterToXercesDOM.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FormatterToXercesDOM.hpp 8 Nov 2004 18:13:57 -0000 1.7
+++ FormatterToXercesDOM.hpp 10 Nov 2004 19:09:12 -0000 1.8
@@ -61,10 +61,10 @@
* @param currentElement current element for nodes
*/
FormatterToXercesDOM(
- MemoryManagerType& theManager,
DOMDocument_Type* doc,
DOMDocumentFragmentType* docFrag,
- DOMElementType* currentElement);
+ DOMElementType* currentElement,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
/**
* Construct a FormatterToXercesDOM instance. it will add the DOM
nodes
@@ -74,9 +74,9 @@
* @param elem current element for nodes
*/
FormatterToXercesDOM(
- MemoryManagerType& theManager,
DOMDocument_Type* doc,
- DOMElementType* currentElement);
+ DOMElementType* currentElement,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
virtual
~FormatterToXercesDOM();
1.6 +1 -1
xml-xalan/c/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp
Index: XercesDOMSupport.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesDOMSupport.hpp 8 Nov 2004 18:13:57 -0000 1.5
+++ XercesDOMSupport.hpp 10 Nov 2004 19:09:12 -0000 1.6
@@ -36,7 +36,7 @@
{
public:
- XercesDOMSupport(MemoryManagerType& theManager);
+ XercesDOMSupport(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
virtual
~XercesDOMSupport();
1.10 +1 -1
xml-xalan/c/src/xalanc/XercesParserLiaison/XercesParserLiaison.hpp
Index: XercesParserLiaison.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XercesParserLiaison/XercesParserLiaison.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XercesParserLiaison.hpp 8 Nov 2004 18:13:57 -0000 1.9
+++ XercesParserLiaison.hpp 10 Nov 2004 19:09:12 -0000 1.10
@@ -88,7 +88,7 @@
/**
* Construct a XercesParserLiaison instance.
*/
- XercesParserLiaison(MemoryManagerType& theManager);
+ XercesParserLiaison(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
virtual
~XercesParserLiaison();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
