dbertoni 2002/11/25 12:01:20
Modified: c/src/XalanTransformer XalanCAPI.cpp
XalanCompiledStylesheet.hpp
XalanCompiledStylesheetDefault.cpp
XalanCompiledStylesheetDefault.hpp
XalanDefaultDocumentBuilder.cpp
XalanDefaultDocumentBuilder.hpp
XalanDefaultParsedSource.cpp
XalanDefaultParsedSource.hpp
XalanDocumentBuilder.hpp XalanParsedSource.cpp
XalanParsedSource.hpp
XalanSourceTreeWrapperParsedSource.cpp
XalanSourceTreeWrapperParsedSource.hpp
XalanTransformer.cpp XalanTransformer.hpp
XalanTransformerDefinitions.hpp
XalanTransformerOutputStream.cpp
XalanTransformerOutputStream.hpp
XalanTransformerProblemListener.cpp
XalanTransformerProblemListener.hpp
XercesDOMParsedSource.cpp XercesDOMParsedSource.hpp
XercesDOMWrapperParsedSource.cpp
XercesDOMWrapperParsedSource.hpp
Log:
Updates for new C++ namespace support.
Revision Changes Path
1.26 +12 -11 xml-xalan/c/src/XalanTransformer/XalanCAPI.cpp
Index: XalanCAPI.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanCAPI.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- XalanCAPI.cpp 14 Nov 2002 23:55:46 -0000 1.25
+++ XalanCAPI.cpp 25 Nov 2002 20:01:19 -0000 1.26
@@ -71,14 +71,19 @@
-#if !defined(XALAN_NO_NAMESPACES)
-using std::istrstream;
-#endif
+#include "XalanCAPI.h"
+#include "XalanTransformer.hpp"
-#include "XalanCAPI.h"
-#include "XalanTransformer.hpp"
+XALAN_USING_STD(istrstream)
+
+XALAN_USING_XALAN(XalanCompiledStylesheet)
+XALAN_USING_XALAN(XalanDOMString)
+XALAN_USING_XALAN(XalanParsedSource)
+XALAN_USING_XALAN(XalanTransformer)
+XALAN_USING_XERCES(XMLPlatformUtils)
+
static bool fInitialized = false;
@@ -233,9 +238,7 @@
char** theOutput,
XalanHandle theXalanHandle)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::ostrstream;
-#endif
+ XALAN_USING_STD(ostrstream)
int status = 0;
@@ -275,9 +278,7 @@
char** theOutput,
XalanHandle theXalanHandle)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::ostrstream;
-#endif
+ XALAN_USING_STD(ostrstream)
ostrstream theOutputStream;
1.5 +9 -1
xml-xalan/c/src/XalanTransformer/XalanCompiledStylesheet.hpp
Index: XalanCompiledStylesheet.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanCompiledStylesheet.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanCompiledStylesheet.hpp 24 Aug 2001 15:17:45 -0000 1.4
+++ XalanCompiledStylesheet.hpp 25 Nov 2002 20:01:19 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,6 +64,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class StylesheetRoot;
@@ -82,6 +86,10 @@
virtual const StylesheetRoot*
getStylesheetRoot() const = 0;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +20 -12
xml-xalan/c/src/XalanTransformer/XalanCompiledStylesheetDefault.cpp
Index: XalanCompiledStylesheetDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanCompiledStylesheetDefault.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanCompiledStylesheetDefault.cpp 25 Aug 2002 16:05:37 -0000
1.4
+++ XalanCompiledStylesheetDefault.cpp 25 Nov 2002 20:01:19 -0000
1.5
@@ -62,14 +62,18 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class SetAndRestoreHandlers
{
public:
SetAndRestoreHandlers(
- XMLParserLiaison& theParserLiaison,
- ErrorHandler* theErrorHandler,
- EntityResolver* theEntityResolver) :
+ XMLParserLiaison& theParserLiaison,
+ ErrorHandlerType* theErrorHandler,
+ EntityResolverType* theEntityResolver) :
m_parserLiaison(theParserLiaison),
m_errorHandler(theParserLiaison.getErrorHandler()),
m_entityResolver(theParserLiaison.getEntityResolver())
@@ -94,11 +98,11 @@
private:
- XMLParserLiaison& m_parserLiaison;
+ XMLParserLiaison& m_parserLiaison;
- ErrorHandler* const m_errorHandler;
+ ErrorHandlerType* const m_errorHandler;
- EntityResolver* const m_entityResolver;
+ EntityResolverType* const m_entityResolver;
};
@@ -109,8 +113,8 @@
const XSLTInputSource&
theStylesheetSource,
XSLTEngineImpl&
theProcessor,
StylesheetConstructionContextDefault&
theConstructionContext,
- ErrorHandler*
theErrorHandler,
- EntityResolver*
theEntityResolver)
+ ErrorHandlerType*
theErrorHandler,
+ EntityResolverType*
theEntityResolver)
{
const SetAndRestoreHandlers theSetAndRestore(
theProcessor.getXMLParserLiaison(),
@@ -123,10 +127,10 @@
XalanCompiledStylesheetDefault::XalanCompiledStylesheetDefault(
- const XSLTInputSource&
theStylesheetSource,
- XSLTEngineImpl&
theProcessor,
- ErrorHandler*
theErrorHandler,
- EntityResolver*
theEntityResolver):
+ const XSLTInputSource& theStylesheetSource,
+ XSLTEngineImpl& theProcessor,
+ ErrorHandlerType* theErrorHandler,
+ EntityResolverType* theEntityResolver):
XalanCompiledStylesheet(),
m_stylesheetXPathFactory(),
m_stylesheetConstructionContext(
@@ -154,3 +158,7 @@
{
return m_stylesheetRoot;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +20 -7
xml-xalan/c/src/XalanTransformer/XalanCompiledStylesheetDefault.hpp
Index: XalanCompiledStylesheetDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanCompiledStylesheetDefault.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanCompiledStylesheetDefault.hpp 25 Aug 2002 16:05:37 -0000
1.3
+++ XalanCompiledStylesheetDefault.hpp 25 Nov 2002 20:01:19 -0000
1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -81,8 +81,17 @@
-class EntityResolver;
-class ErrorHandler;
+XALAN_DECLARE_XERCES_CLASS(EntityResolver)
+XALAN_DECLARE_XERCES_CLASS(ErrorHandler)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+typedef XERCES_CPP_NAMESPACE_QUALIFIER EntityResolver
EntityResolverType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER ErrorHandler
ErrorHandlerType;
@@ -91,10 +100,10 @@
public:
XalanCompiledStylesheetDefault(
- const XSLTInputSource&
theStylesheetSource,
- XSLTEngineImpl&
theProcessor,
- ErrorHandler*
theErrorHandler = 0,
- EntityResolver*
theEntityResolver = 0);
+ const XSLTInputSource& theStylesheetSource,
+ XSLTEngineImpl& theProcessor,
+ ErrorHandlerType* theErrorHandler = 0,
+ EntityResolverType* theEntityResolver = 0);
virtual
~XalanCompiledStylesheetDefault();
@@ -110,6 +119,10 @@
const StylesheetRoot* const
m_stylesheetRoot;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +12 -4
xml-xalan/c/src/XalanTransformer/XalanDefaultDocumentBuilder.cpp
Index: XalanDefaultDocumentBuilder.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanDefaultDocumentBuilder.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanDefaultDocumentBuilder.cpp 10 May 2002 21:53:26 -0000 1.7
+++ XalanDefaultDocumentBuilder.cpp 25 Nov 2002 20:01:19 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanDefaultDocumentBuilder::XalanDefaultDocumentBuilder(const
XalanDOMString& theURI) :
m_domSupport(),
m_parserLiaison(),
@@ -100,7 +104,7 @@
-ContentHandler*
+ContentHandlerType*
XalanDefaultDocumentBuilder::getContentHandler()
{
return &m_contentHandler;
@@ -108,7 +112,7 @@
-DTDHandler*
+DTDHandlerType*
XalanDefaultDocumentBuilder::getDTDHandler()
{
return &m_contentHandler;
@@ -116,7 +120,7 @@
-LexicalHandler*
+LexicalHandlerType*
XalanDefaultDocumentBuilder::getLexicalHandler()
{
return &m_contentHandler;
@@ -129,3 +133,7 @@
{
return m_uri;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +12 -4
xml-xalan/c/src/XalanTransformer/XalanDefaultDocumentBuilder.hpp
Index: XalanDefaultDocumentBuilder.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanDefaultDocumentBuilder.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanDefaultDocumentBuilder.hpp 18 Dec 2001 18:02:30 -0000 1.5
+++ XalanDefaultDocumentBuilder.hpp 25 Nov 2002 20:01:19 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -74,6 +74,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* This is class is designed to allow a XalanTranfomer object
* to use a document that is build dynamically by a user.
@@ -101,13 +105,13 @@
virtual const XalanDOMString&
getURI() const;
- virtual ContentHandler*
+ virtual ContentHandlerType*
getContentHandler();
- virtual DTDHandler*
+ virtual DTDHandlerType*
getDTDHandler();
- virtual LexicalHandler*
+ virtual LexicalHandlerType*
getLexicalHandler();
private:
@@ -127,6 +131,10 @@
const XalanDOMString m_uri;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.16 +12 -4
xml-xalan/c/src/XalanTransformer/XalanDefaultParsedSource.cpp
Index: XalanDefaultParsedSource.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanDefaultParsedSource.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XalanDefaultParsedSource.cpp 11 Oct 2002 02:00:34 -0000 1.15
+++ XalanDefaultParsedSource.cpp 25 Nov 2002 20:01:19 -0000 1.16
@@ -78,6 +78,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanDefaultParsedSourceDOMSupport::XalanDefaultParsedSourceDOMSupport(
const XalanSourceTreeParserLiaison&
theParserLiaison,
const XalanSourceTreeDOMSupport&
theDOMSupport) :
@@ -170,10 +174,10 @@
XalanDefaultParsedSource::XalanDefaultParsedSource(
- const InputSource& theInputSource,
+ const InputSourceType& theInputSource,
bool fValidate,
- ErrorHandler* theErrorHandler,
- EntityResolver* theEntityResolver,
+ ErrorHandlerType* theErrorHandler,
+ EntityResolverType* theEntityResolver,
const XalanDOMChar*
theExternalSchemaLocation,
const XalanDOMChar*
theExternalNoNamespaceSchemaLocation) :
XalanParsedSource(),
@@ -200,7 +204,7 @@
{
m_uri = URISupport::getURLStringFromString(theSystemID);
}
- catch(const XMLException&)
+ catch(const XERCES_CPP_NAMESPACE_QUALIFIER XMLException&)
{
// Assume that any exception here relates to get the
url from
// the system ID. We'll assume that it's just a fake
base identifier
@@ -240,3 +244,7 @@
{
return m_uri;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.14 +11 -5
xml-xalan/c/src/XalanTransformer/XalanDefaultParsedSource.hpp
Index: XalanDefaultParsedSource.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanDefaultParsedSource.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XalanDefaultParsedSource.hpp 15 Aug 2002 04:40:51 -0000 1.13
+++ XalanDefaultParsedSource.hpp 25 Nov 2002 20:01:19 -0000 1.14
@@ -73,8 +73,10 @@
-class EntityResolver;
-class ErrorHandler;
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XSLTInputSource;
class XalanSourceTreeDocument;
@@ -161,10 +163,10 @@
public:
XalanDefaultParsedSource(
- const InputSource& theInputSource,
+ const InputSourceType& theInputSource,
bool fValidate =
false,
- ErrorHandler* theErrorHandler = 0,
- EntityResolver* theEntityResolver = 0,
+ ErrorHandlerType* theErrorHandler = 0,
+ EntityResolverType* theEntityResolver = 0,
const XalanDOMChar*
theExternalSchemaLocation = 0,
const XalanDOMChar*
theExternalNoNamespaceSchemaLocation = 0);
@@ -198,6 +200,10 @@
XalanDOMString m_uri;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +24 -7 xml-xalan/c/src/XalanTransformer/XalanDocumentBuilder.hpp
Index: XalanDocumentBuilder.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanDocumentBuilder.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanDocumentBuilder.hpp 21 Aug 2001 23:02:59 -0000 1.5
+++ XalanDocumentBuilder.hpp 25 Nov 2002 20:01:19 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,10 +69,23 @@
-class ContentHandler;
+XALAN_DECLARE_XERCES_CLASS(ContentHandler)
+XALAN_DECLARE_XERCES_CLASS(DTDHandler)
+XALAN_DECLARE_XERCES_CLASS(LexicalHandler)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+typedef XERCES_CPP_NAMESPACE_QUALIFIER ContentHandler
ContentHandlerType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER DTDHandler
DTDHandlerType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER LexicalHandler
LexicalHandlerType;
+
+
+
class DOMSupport;
-class DTDHandler;
-class LexicalHandler;
class XalanDocument;
@@ -101,17 +114,21 @@
getURI() const = 0;
// These are new to XalanDocumentBuilder...
- virtual ContentHandler*
+ virtual ContentHandlerType*
getContentHandler() = 0;
- virtual DTDHandler*
+ virtual DTDHandlerType*
getDTDHandler() = 0;
- virtual LexicalHandler*
+ virtual LexicalHandlerType*
getLexicalHandler() = 0;
private:
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XalanTransformer/XalanParsedSource.cpp
Index: XalanParsedSource.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanParsedSource.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanParsedSource.cpp 30 Mar 2001 21:35:44 -0000 1.1
+++ XalanParsedSource.cpp 25 Nov 2002 20:01:19 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,6 +57,10 @@
#include <XalanTransformer/XalanParsedSource.hpp>
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
XalanParsedSource::XalanParsedSource()
{
@@ -67,3 +71,7 @@
XalanParsedSource::~XalanParsedSource()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +9 -1 xml-xalan/c/src/XalanTransformer/XalanParsedSource.hpp
Index: XalanParsedSource.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanParsedSource.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanParsedSource.hpp 21 Aug 2001 23:02:59 -0000 1.4
+++ XalanParsedSource.hpp 25 Nov 2002 20:01:19 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -70,6 +70,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class DOMSupport;
class XMLParserLiaison;
@@ -145,6 +149,10 @@
virtual const XalanDOMString&
getURI() const = 0;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0
xml-xalan/c/src/XalanTransformer/XalanSourceTreeWrapperParsedSource.cpp
Index: XalanSourceTreeWrapperParsedSource.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanSourceTreeWrapperParsedSource.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanSourceTreeWrapperParsedSource.cpp 10 May 2002 21:53:26 -0000
1.2
+++ XalanSourceTreeWrapperParsedSource.cpp 25 Nov 2002 20:01:19 -0000
1.3
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSourceTreeWrapperParsedSource::XalanSourceTreeWrapperParsedSource(
XalanSourceTreeDocument* theDocument,
XalanSourceTreeParserLiaison& theParserLiaison,
@@ -115,3 +119,7 @@
{
return m_uri;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +12 -0
xml-xalan/c/src/XalanTransformer/XalanSourceTreeWrapperParsedSource.hpp
Index: XalanSourceTreeWrapperParsedSource.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanSourceTreeWrapperParsedSource.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanSourceTreeWrapperParsedSource.hpp 10 May 2002 21:14:07 -0000
1.1
+++ XalanSourceTreeWrapperParsedSource.hpp 25 Nov 2002 20:01:19 -0000
1.2
@@ -64,10 +64,18 @@
+#include <XalanDOM/XalanDOMString.hpp>
+
+
+
#include <XalanTransformer/XalanParsedSource.hpp>
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanSourceTreeDOMSupport;
class XalanSourceTreeDocument;
class XalanSourceTreeParserLiaison;
@@ -110,6 +118,10 @@
const XalanDOMString m_uri;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.63 +17 -10 xml-xalan/c/src/XalanTransformer/XalanTransformer.cpp
Index: XalanTransformer.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformer.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- XalanTransformer.cpp 14 Nov 2002 23:55:46 -0000 1.62
+++ XalanTransformer.cpp 25 Nov 2002 20:01:19 -0000 1.63
@@ -130,6 +130,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XSLTInit* XalanTransformer::s_xsltInit = 0;
@@ -147,7 +151,7 @@
m_externalSchemaLocation(),
m_externalNoNamespaceSchemaLocation(),
m_problemListener(0),
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
m_warningStream(&cerr),
#else
m_warningStream(&std::cerr),
@@ -169,9 +173,7 @@
XalanTransformer::~XalanTransformer()
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
+ XALAN_USING_STD(for_each)
// Clean up all entries in the compliledStylesheets vector.
for_each(m_compiledStylesheets.begin(),
@@ -430,6 +432,11 @@
+XALAN_USING_XERCES(XMLException)
+XALAN_USING_XERCES(SAXException)
+
+
+
int
XalanTransformer::compileStylesheet(
const XSLTInputSource&
theStylesheetSource,
@@ -566,9 +573,7 @@
int
XalanTransformer::destroyStylesheet(const XalanCompiledStylesheet*
theStylesheet)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find;
-#endif
+ XALAN_USING_STD(find)
const CompiledStylesheetPtrVectorType::iterator i =
find(
@@ -760,9 +765,7 @@
bool
XalanTransformer::removeTraceListener(TraceListener* theTraceListener)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find;
-#endif
+ XALAN_USING_STD(find)
const TraceListenerVectorType::iterator i =
find(
@@ -1243,3 +1246,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.44 +27 -11 xml-xalan/c/src/XalanTransformer/XalanTransformer.hpp
Index: XalanTransformer.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformer.hpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- XalanTransformer.hpp 14 Nov 2002 23:55:46 -0000 1.43
+++ XalanTransformer.hpp 25 Nov 2002 20:01:19 -0000 1.44
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -84,8 +84,20 @@
-class EntityResolver;
-class ErrorHandler;
+XALAN_DECLARE_XERCES_CLASS(EntityResolver)
+XALAN_DECLARE_XERCES_CLASS(ErrorHandler)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+typedef XERCES_CPP_NAMESPACE_QUALIFIER EntityResolver
EntityResolverType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER ErrorHandler
ErrorHandlerType;
+
+
+
class Function;
class StylesheetExecutionContextDefault;
class ProblemListener;
@@ -108,7 +120,7 @@
{
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef ostream StreamType;
#else
typedef std::ostream StreamType;
@@ -530,7 +542,7 @@
*
* @return The pointer to the installed entity resolver object.
*/
- EntityResolver*
+ EntityResolverType*
getEntityResolver() const
{
return m_entityResolver;
@@ -546,7 +558,7 @@
* entities in the XML file.
*/
void
- setEntityResolver(EntityResolver* theResolver)
+ setEntityResolver(EntityResolverType* theResolver)
{
m_entityResolver = theResolver;
}
@@ -556,7 +568,7 @@
*
* @return The pointer to the installed error handler object.
*/
- ErrorHandler*
+ ErrorHandlerType*
getErrorHandler() const
{
return m_errorHandler;
@@ -568,7 +580,7 @@
* @param handler A pointer to the error handler to be called upon
error.
*/
void
- setErrorHandler(ErrorHandler* theErrorHandler)
+ setErrorHandler(ErrorHandlerType* theErrorHandler)
{
m_errorHandler = theErrorHandler;
}
@@ -755,7 +767,7 @@
return m_warningStream;
}
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<const XalanCompiledStylesheet*>
CompiledStylesheetPtrVectorType;
typedef vector<const XalanParsedSource*>
ParsedSourcePtrVectorType;
typedef pair<XalanDOMString, XalanDOMString> ParamPairType;
@@ -889,9 +901,9 @@
bool
m_useValidation;
- EntityResolver*
m_entityResolver;
+ EntityResolverType*
m_entityResolver;
- ErrorHandler*
m_errorHandler;
+ ErrorHandlerType*
m_errorHandler;
XalanDOMString
m_externalSchemaLocation;
@@ -906,6 +918,10 @@
static const XSLTInit* s_xsltInit;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +1 -1
xml-xalan/c/src/XalanTransformer/XalanTransformerDefinitions.hpp
Index: XalanTransformerDefinitions.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformerDefinitions.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanTransformerDefinitions.hpp 26 Sep 2001 15:25:17 -0000 1.6
+++ XalanTransformerDefinitions.hpp 25 Nov 2002 20:01:19 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.8 +9 -1
xml-xalan/c/src/XalanTransformer/XalanTransformerOutputStream.cpp
Index: XalanTransformerOutputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformerOutputStream.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanTransformerOutputStream.cpp 26 Sep 2001 15:25:17 -0000 1.7
+++ XalanTransformerOutputStream.cpp 25 Nov 2002 20:01:19 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,6 +58,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanTransformerOutputStream::XalanTransformerOutputStream(
void* theOutputHandle,
XalanOutputHandlerType theOutputHandler,
@@ -105,3 +109,7 @@
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +9 -1
xml-xalan/c/src/XalanTransformer/XalanTransformerOutputStream.hpp
Index: XalanTransformerOutputStream.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformerOutputStream.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XalanTransformerOutputStream.hpp 26 Sep 2001 15:25:17 -0000 1.8
+++ XalanTransformerOutputStream.hpp 25 Nov 2002 20:01:19 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// A class for output to a user defined (callback) function.
class XALAN_TRANSFORMER_EXPORT XalanTransformerOutputStream : public
XalanOutputStream
{
@@ -115,6 +119,10 @@
XalanFlushHandlerType m_flushHandler;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +9 -5
xml-xalan/c/src/XalanTransformer/XalanTransformerProblemListener.cpp
Index: XalanTransformerProblemListener.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformerProblemListener.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanTransformerProblemListener.cpp 14 Nov 2002 23:55:46 -0000
1.4
+++ XalanTransformerProblemListener.cpp 25 Nov 2002 20:01:19 -0000
1.5
@@ -79,12 +79,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanTransformerProblemListener::XalanTransformerProblemListener(
-#if defined(XALAN_NO_NAMESPACES)
- ostream* theWarningStream,
-#else
- std::ostream* theWarningStream,
-#endif
+ StreamType* theWarningStream,
PrintWriter* thePrintWriter) :
ProblemListener(),
m_problemListener(thePrintWriter),
@@ -151,3 +151,7 @@
*m_warningStream << theWarning;
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +15 -9
xml-xalan/c/src/XalanTransformer/XalanTransformerProblemListener.hpp
Index: XalanTransformerProblemListener.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformerProblemListener.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanTransformerProblemListener.hpp 14 Nov 2002 23:55:46 -0000
1.4
+++ XalanTransformerProblemListener.hpp 25 Nov 2002 20:01:19 -0000
1.5
@@ -78,16 +78,22 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_TRANSFORMER_EXPORT XalanTransformerProblemListener : public
ProblemListener
{
public:
- XalanTransformerProblemListener(
-#if defined(XALAN_NO_NAMESPACES)
- ostream* theWarningStream,
+#if defined(XALAN_NO_STD_NAMESPACE)
+ typedef ostream StreamType;
#else
- std::ostream* theWarningStream,
+ typedef std::ostream StreamType;
#endif
+
+ XalanTransformerProblemListener(
+ StreamType* theStream,
PrintWriter* thePrintWriter);
virtual
@@ -113,12 +119,12 @@
ProblemListenerDefault m_problemListener;
-#if defined(XALAN_NO_NAMESPACES)
- ostream* m_warningStream;
-#else
- std::ostream* m_warningStream;
-#endif
+ StreamType* m_warningStream;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.14 +12 -4
xml-xalan/c/src/XalanTransformer/XercesDOMParsedSource.cpp
Index: XercesDOMParsedSource.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XercesDOMParsedSource.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XercesDOMParsedSource.cpp 11 Oct 2002 02:00:34 -0000 1.13
+++ XercesDOMParsedSource.cpp 25 Nov 2002 20:01:19 -0000 1.14
@@ -70,6 +70,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesDOMParsedSourceHelper::XercesDOMParsedSourceHelper() :
m_domSupport(),
m_parserLiaison()
@@ -101,10 +105,10 @@
XercesDOMParsedSource::XercesDOMParsedSource(
- const InputSource& theInputSource,
+ const InputSourceType& theInputSource,
bool fValidate,
- ErrorHandler* theErrorHandler,
- EntityResolver* theEntityResolver,
+ ErrorHandlerType* theErrorHandler,
+ EntityResolverType* theEntityResolver,
const XalanDOMChar*
theExternalSchemaLocation,
const XalanDOMChar*
theExternalNoNamespaceSchemaLocation) :
XalanParsedSource(),
@@ -128,7 +132,7 @@
{
m_uri = URISupport::getURLStringFromString(theSystemID);
}
- catch(const XMLException&)
+ catch(const XERCES_CPP_NAMESPACE_QUALIFIER XMLException&)
{
// Assume that any exception here relates to get the
url from
// the system ID. We'll assume that it's just a fake
base identifier
@@ -168,3 +172,7 @@
{
return m_uri;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +6 -7
xml-xalan/c/src/XalanTransformer/XercesDOMParsedSource.hpp
Index: XercesDOMParsedSource.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XercesDOMParsedSource.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XercesDOMParsedSource.hpp 15 Aug 2002 04:40:52 -0000 1.9
+++ XercesDOMParsedSource.hpp 25 Nov 2002 20:01:19 -0000 1.10
@@ -73,9 +73,7 @@
-class EntityResolver;
-class ErrorHandler;
-class InputSource;
+XALAN_CPP_NAMESPACE_BEGIN
@@ -111,10 +109,10 @@
public:
XercesDOMParsedSource(
- const InputSource& theInputSource,
+ const InputSourceType& theInputSource,
bool fValidate =
false,
- ErrorHandler* theErrorHandler = 0,
- EntityResolver* theEntityResolver = 0,
+ ErrorHandlerType* theErrorHandler = 0,
+ EntityResolverType* theEntityResolver = 0,
const XalanDOMChar*
theExternalSchemaLocation = 0,
const XalanDOMChar*
theExternalNoNamespaceSchemaLocation = 0);
@@ -141,7 +139,8 @@
-#endif // XERCESDOMPARSEDSOURCE_HEADER_GUARD
+XALAN_CPP_NAMESPACE_END
+#endif // XERCESDOMPARSEDSOURCE_HEADER_GUARD
1.7 +13 -5
xml-xalan/c/src/XalanTransformer/XercesDOMWrapperParsedSource.cpp
Index: XercesDOMWrapperParsedSource.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XercesDOMWrapperParsedSource.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesDOMWrapperParsedSource.cpp 17 Nov 2002 00:49:01 -0000 1.6
+++ XercesDOMWrapperParsedSource.cpp 25 Nov 2002 20:01:19 -0000 1.7
@@ -76,11 +76,15 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesDOMWrapperParsedSource::XercesDOMWrapperParsedSource(
- const DOM_Document& theDocument,
- XercesParserLiaison& theParserLiaison,
- XercesDOMSupport& theDOMSupport,
- const XalanDOMString& theURI) :
+ const DOM_DocumentType& theDocument,
+ XercesParserLiaison& theParserLiaison,
+ XercesDOMSupport& theDOMSupport,
+ const XalanDOMString& theURI) :
XalanParsedSource(),
m_parserLiaison(theParserLiaison),
m_domSupport(theDOMSupport),
@@ -93,7 +97,7 @@
XercesDOMWrapperParsedSource::XercesDOMWrapperParsedSource(
- const DOMDocument* theDocument,
+ const DOMDocumentType* theDocument,
XercesParserLiaison& theParserLiaison,
XercesDOMSupport& theDOMSupport,
const XalanDOMString& theURI) :
@@ -136,3 +140,7 @@
{
return m_uri;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +27 -7
xml-xalan/c/src/XalanTransformer/XercesDOMWrapperParsedSource.hpp
Index: XercesDOMWrapperParsedSource.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XercesDOMWrapperParsedSource.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesDOMWrapperParsedSource.hpp 18 Nov 2002 17:10:14 -0000 1.5
+++ XercesDOMWrapperParsedSource.hpp 25 Nov 2002 20:01:19 -0000 1.6
@@ -64,12 +64,28 @@
+#include <XalanDOM/XalanDOMString.hpp>
+
+
+
#include <XalanTransformer/XalanParsedSource.hpp>
-class DOMDocument;
-class DOM_Document;
+XALAN_DECLARE_XERCES_CLASS(DOM_Document)
+XALAN_DECLARE_XERCES_CLASS(DOMDocument)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Document DOM_DocumentType;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument DOMDocumentType;
+
+
+
class XercesParserLiaison;
class XercesDOMSupport;
@@ -94,10 +110,10 @@
* @deprecated This constructor is deprecated.
*/
XercesDOMWrapperParsedSource(
- const DOM_Document& theDocument,
- XercesParserLiaison& theParserLiaison,
- XercesDOMSupport& theDOMSupport,
- const XalanDOMString& theURI = XalanDOMString());
+ const DOM_DocumentType& theDocument,
+ XercesParserLiaison& theParserLiaison,
+ XercesDOMSupport& theDOMSupport,
+ const XalanDOMString& theURI =
XalanDOMString());
/**
* Constructor
@@ -108,7 +124,7 @@
* @param theURI The URI of the document, if any.
*/
XercesDOMWrapperParsedSource(
- const DOMDocument* theDocument,
+ const DOMDocumentType* theDocument,
XercesParserLiaison& theParserLiaison,
XercesDOMSupport& theDOMSupport,
const XalanDOMString& theURI = XalanDOMString());
@@ -135,6 +151,10 @@
const XalanDOMString m_uri;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
