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/12/15 18:28:49 UTC
cvs commit: xml-xalan/c/src/xalanc/XercesParserLiaison XercesDOMSupport.hpp XercesParserLiaison.cpp XercesParserLiaison.hpp
dmitryh 2004/12/15 09:28:49
Modified: c/src/xalanc/DOMSupport DOMSupportDefault.hpp
c/src/xalanc/PlatformSupport DOMStringPrintWriter.cpp
NullPrintWriter.cpp PrintWriter.cpp PrintWriter.hpp
XalanOutputStreamPrintWriter.cpp
c/src/xalanc/XalanTransformer XalanDefaultParsedSource.cpp
XalanDefaultParsedSource.hpp
XalanDocumentBuilder.hpp XalanParsedSource.hpp
XalanSourceTreeWrapperParsedSource.hpp
XercesDOMParsedSource.cpp XercesDOMParsedSource.hpp
XercesDOMWrapperParsedSource.hpp
c/src/xalanc/XercesParserLiaison XercesDOMSupport.hpp
XercesParserLiaison.cpp XercesParserLiaison.hpp
Log:
Fix for providing backward API compatibility for the rest of "external" classes
Revision Changes Path
1.7 +1 -1 xml-xalan/c/src/xalanc/DOMSupport/DOMSupportDefault.hpp
Index: DOMSupportDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/DOMSupport/DOMSupportDefault.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DOMSupportDefault.hpp 11 Nov 2004 20:24:41 -0000 1.6
+++ DOMSupportDefault.hpp 15 Dec 2004 17:28:47 -0000 1.7
@@ -39,7 +39,7 @@
{
public:
- DOMSupportDefault(MemoryManagerType& theManager);
+ DOMSupportDefault(MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
virtual
~DOMSupportDefault();
1.9 +1 -1 xml-xalan/c/src/xalanc/PlatformSupport/DOMStringPrintWriter.cpp
Index: DOMStringPrintWriter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/DOMStringPrintWriter.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DOMStringPrintWriter.cpp 8 Nov 2004 18:11:05 -0000 1.8
+++ DOMStringPrintWriter.cpp 15 Dec 2004 17:28:47 -0000 1.9
@@ -27,7 +27,7 @@
DOMStringPrintWriter::DOMStringPrintWriter(XalanDOMString& theString) :
-PrintWriter(theString.getMemoryManager(), true),
+PrintWriter(true, theString.getMemoryManager()),
m_outputString(&theString)
{
}
1.6 +1 -1 xml-xalan/c/src/xalanc/PlatformSupport/NullPrintWriter.cpp
Index: NullPrintWriter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/NullPrintWriter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NullPrintWriter.cpp 8 Nov 2004 18:11:05 -0000 1.5
+++ NullPrintWriter.cpp 15 Dec 2004 17:28:47 -0000 1.6
@@ -23,7 +23,7 @@
NullPrintWriter::NullPrintWriter(MemoryManagerType& theManager) :
- PrintWriter(theManager, false)
+ PrintWriter(false, theManager)
{
}
1.6 +1 -1 xml-xalan/c/src/xalanc/PlatformSupport/PrintWriter.cpp
Index: PrintWriter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/PrintWriter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PrintWriter.cpp 8 Nov 2004 18:11:05 -0000 1.5
+++ PrintWriter.cpp 15 Dec 2004 17:28:48 -0000 1.6
@@ -56,7 +56,7 @@
-PrintWriter::PrintWriter(MemoryManagerType& theManager, bool fAutoFlush) :
+PrintWriter::PrintWriter( bool fAutoFlush, MemoryManagerType& theManager) :
Writer(),
m_fAutoFlush(fAutoFlush),
m_memoryManager(theManager)
1.6 +1 -1 xml-xalan/c/src/xalanc/PlatformSupport/PrintWriter.hpp
Index: PrintWriter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/PrintWriter.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PrintWriter.hpp 8 Nov 2004 18:11:05 -0000 1.5
+++ PrintWriter.hpp 15 Dec 2004 17:28:48 -0000 1.6
@@ -41,7 +41,7 @@
*
* @param fAutoFlush if true, the output will not be buffered
*/
- PrintWriter(MemoryManagerType& theManager, bool fAutoFlush = false);
+ PrintWriter( bool fAutoFlush = false, MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
MemoryManagerType&
getMemoryManager()
1.9 +1 -1 xml-xalan/c/src/xalanc/PlatformSupport/XalanOutputStreamPrintWriter.cpp
Index: XalanOutputStreamPrintWriter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanOutputStreamPrintWriter.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XalanOutputStreamPrintWriter.cpp 8 Nov 2004 18:11:05 -0000 1.8
+++ XalanOutputStreamPrintWriter.cpp 15 Dec 2004 17:28:48 -0000 1.9
@@ -38,7 +38,7 @@
XalanOutputStreamPrintWriter::XalanOutputStreamPrintWriter(
XalanOutputStream& theOutputStream,
bool fAutoFlush) :
- PrintWriter(theOutputStream.getMemoryManager(), fAutoFlush),
+ PrintWriter(fAutoFlush, theOutputStream.getMemoryManager()),
m_outputStream(theOutputStream),
m_buffer(theOutputStream.getMemoryManager()),
m_flushWideChars(false)
1.8 +4 -4 xml-xalan/c/src/xalanc/XalanTransformer/XalanDefaultParsedSource.cpp
Index: XalanDefaultParsedSource.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XalanDefaultParsedSource.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanDefaultParsedSource.cpp 11 Nov 2004 20:24:41 -0000 1.7
+++ XalanDefaultParsedSource.cpp 15 Dec 2004 17:28:48 -0000 1.8
@@ -150,13 +150,13 @@
XalanDefaultParsedSource::XalanDefaultParsedSource(
const InputSourceType& theInputSource,
- MemoryManagerType& theManager,
bool fValidate,
ErrorHandlerType* theErrorHandler,
EntityResolverType* theEntityResolver,
const XalanDOMChar* theExternalSchemaLocation,
const XalanDOMChar* theExternalNoNamespaceSchemaLocation,
- bool fPoolAllTextNodes) :
+ bool fPoolAllTextNodes,
+ MemoryManagerType& theManager) :
XalanParsedSource(),
m_parserLiaison(theManager),
m_domSupport(m_parserLiaison),
@@ -213,13 +213,13 @@
new (theResult) ThisType(
theInputSource,
- theManager,
fValidate,
theErrorHandler,
theEntityResolver,
theExternalSchemaLocation,
theExternalNoNamespaceSchemaLocation,
- fPoolAllTextNodes);
+ fPoolAllTextNodes,
+ theManager);
theGuard.release();
1.8 +4 -4 xml-xalan/c/src/xalanc/XalanTransformer/XalanDefaultParsedSource.hpp
Index: XalanDefaultParsedSource.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XalanDefaultParsedSource.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanDefaultParsedSource.hpp 11 Nov 2004 20:24:41 -0000 1.7
+++ XalanDefaultParsedSource.hpp 15 Dec 2004 17:28:48 -0000 1.8
@@ -87,7 +87,7 @@
public:
XalanDefaultParsedSourceHelper(const XalanSourceTreeDOMSupport& theSourceDOMSupport,
- MemoryManagerType& theManager);
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
static XalanDefaultParsedSourceHelper*
create(const XalanSourceTreeDOMSupport& theSourceDOMSupport,
@@ -128,13 +128,13 @@
XalanDefaultParsedSource(
const InputSourceType& theInputSource,
- MemoryManagerType& theManager,
bool fValidate = false,
ErrorHandlerType* theErrorHandler = 0,
EntityResolverType* theEntityResolver = 0,
const XalanDOMChar* theExternalSchemaLocation = 0,
const XalanDOMChar* theExternalNoNamespaceSchemaLocation = 0,
- bool fPoolAllTextNodes = XalanSourceTreeDocument::getPoolAllTextNodes());
+ bool fPoolAllTextNodes = XalanSourceTreeDocument::getPoolAllTextNodes(),
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
static XalanDefaultParsedSource*
create(
@@ -154,7 +154,7 @@
getDocument() const;
virtual XalanParsedSourceHelper*
- createHelper(MemoryManagerType& theManager) const;
+ createHelper(MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR) const;
virtual const XalanDOMString&
getURI() const;
1.6 +1 -1 xml-xalan/c/src/xalanc/XalanTransformer/XalanDocumentBuilder.hpp
Index: XalanDocumentBuilder.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XalanDocumentBuilder.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanDocumentBuilder.hpp 8 Nov 2004 19:20:04 -0000 1.5
+++ XalanDocumentBuilder.hpp 15 Dec 2004 17:28:48 -0000 1.6
@@ -69,7 +69,7 @@
getDocument() const = 0;
virtual XalanParsedSourceHelper*
- createHelper(MemoryManagerType& theManager) const = 0;
+ createHelper(MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR) const = 0;
virtual const XalanDOMString&
getURI() const = 0;
1.6 +1 -1 xml-xalan/c/src/xalanc/XalanTransformer/XalanParsedSource.hpp
Index: XalanParsedSource.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XalanParsedSource.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanParsedSource.hpp 8 Nov 2004 19:20:04 -0000 1.5
+++ XalanParsedSource.hpp 15 Dec 2004 17:28:48 -0000 1.6
@@ -99,7 +99,7 @@
* @return A pointer to a XalanParsedSourceHelper instance.
*/
virtual XalanParsedSourceHelper*
- createHelper(MemoryManagerType& theManager) const = 0;
+ createHelper(MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR ) const = 0;
/**
* Get the URI for the parsed source, if any.
1.8 +1 -1 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanSourceTreeWrapperParsedSource.hpp 11 Nov 2004 03:27:20 -0000 1.7
+++ XalanSourceTreeWrapperParsedSource.hpp 15 Dec 2004 17:28:48 -0000 1.8
@@ -64,7 +64,7 @@
getDocument() const;
virtual XalanParsedSourceHelper*
- createHelper(MemoryManagerType& theManager) const;
+ createHelper(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR) const;
virtual const XalanDOMString&
getURI() const;
1.6 +4 -4 xml-xalan/c/src/xalanc/XalanTransformer/XercesDOMParsedSource.cpp
Index: XercesDOMParsedSource.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XercesDOMParsedSource.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesDOMParsedSource.cpp 8 Nov 2004 19:20:05 -0000 1.5
+++ XercesDOMParsedSource.cpp 15 Dec 2004 17:28:48 -0000 1.6
@@ -78,13 +78,13 @@
XercesDOMParsedSource::XercesDOMParsedSource(
- MemoryManagerType& theManager,
const InputSourceType& theInputSource,
bool fValidate,
ErrorHandlerType* theErrorHandler,
EntityResolverType* theEntityResolver,
const XalanDOMChar* theExternalSchemaLocation,
- const XalanDOMChar* theExternalNoNamespaceSchemaLocation) :
+ const XalanDOMChar* theExternalNoNamespaceSchemaLocation,
+ MemoryManagerType& theManager) :
XalanParsedSource(),
m_parserLiaison(theManager),
m_parsedSource(0),
@@ -135,13 +135,13 @@
ThisType* theResult = theGuard.get();
new (theResult) ThisType(
- theManager,
theInputSource,
fValidate,
theErrorHandler,
theEntityResolver,
theExternalSchemaLocation,
- theExternalNoNamespaceSchemaLocation);
+ theExternalNoNamespaceSchemaLocation,
+ theManager);
theGuard.release();
1.6 +4 -4 xml-xalan/c/src/xalanc/XalanTransformer/XercesDOMParsedSource.hpp
Index: XercesDOMParsedSource.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XercesDOMParsedSource.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesDOMParsedSource.hpp 8 Nov 2004 19:20:05 -0000 1.5
+++ XercesDOMParsedSource.hpp 15 Dec 2004 17:28:48 -0000 1.6
@@ -40,7 +40,7 @@
{
public:
- XercesDOMParsedSourceHelper(MemoryManagerType& theManager);
+ XercesDOMParsedSourceHelper(MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
~XercesDOMParsedSourceHelper();
@@ -71,13 +71,13 @@
public:
XercesDOMParsedSource(
- MemoryManagerType& theManager,
const InputSourceType& theInputSource,
bool fValidate = false,
ErrorHandlerType* theErrorHandler = 0,
EntityResolverType* theEntityResolver = 0,
const XalanDOMChar* theExternalSchemaLocation = 0,
- const XalanDOMChar* theExternalNoNamespaceSchemaLocation = 0);
+ const XalanDOMChar* theExternalNoNamespaceSchemaLocation = 0,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
static XercesDOMParsedSource*
create(
@@ -96,7 +96,7 @@
getDocument() const;
virtual XalanParsedSourceHelper*
- createHelper(MemoryManagerType& theManager) const;
+ createHelper(MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR) const;
virtual const XalanDOMString&
getURI() const;
1.9 +1 -1 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesDOMWrapperParsedSource.hpp 11 Nov 2004 03:27:20 -0000 1.8
+++ XercesDOMWrapperParsedSource.hpp 15 Dec 2004 17:28:48 -0000 1.9
@@ -100,7 +100,7 @@
getDocument() const;
virtual XalanParsedSourceHelper*
- createHelper(MemoryManagerType& theManager) const;
+ createHelper(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR) const;
virtual const XalanDOMString&
getURI() const;
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesDOMSupport.hpp 11 Nov 2004 20:24:41 -0000 1.7
+++ XercesDOMSupport.hpp 15 Dec 2004 17:28:49 -0000 1.8
@@ -36,7 +36,7 @@
{
public:
- XercesDOMSupport(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
+ XercesDOMSupport(MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
virtual
~XercesDOMSupport();
1.11 +1 -1 xml-xalan/c/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp
Index: XercesParserLiaison.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XercesParserLiaison.cpp 14 Nov 2004 21:13:10 -0000 1.10
+++ XercesParserLiaison.cpp 15 Dec 2004 17:28:49 -0000 1.11
@@ -64,7 +64,7 @@
XALAN_CPP_NAMESPACE_BEGIN
-XercesParserLiaison::XercesParserLiaison(MemoryManagerType& theManager, XercesDOMSupport& /* theSupport */) :
+XercesParserLiaison::XercesParserLiaison( XercesDOMSupport& /* theSupport */, MemoryManagerType& theManager) :
m_indent(-1),
m_useValidation(false),
m_includeIgnorableWhitespace(true),
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XercesParserLiaison.hpp 14 Nov 2004 21:13:10 -0000 1.11
+++ XercesParserLiaison.hpp 15 Dec 2004 17:28:49 -0000 1.12
@@ -83,7 +83,7 @@
*
* @deprecated This constructor is deprecated. Use the next constructor instead.
*/
- XercesParserLiaison(MemoryManagerType& theManager, XercesDOMSupport& theSupport);
+ XercesParserLiaison( XercesDOMSupport& theSupport, MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
/**
* Construct a XercesParserLiaison instance.
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org