tng 2002/11/04 06:57:03
Modified: c/src/xercesc/parsers AbstractDOMParser.cpp
AbstractDOMParser.hpp DOMBuilderImpl.cpp
DOMBuilderImpl.hpp SAX2XMLReaderImpl.cpp
SAX2XMLReaderImpl.hpp SAXParser.cpp SAXParser.hpp
XercesDOMParser.cpp XercesDOMParser.hpp
Log:
C++ Namespace Support.
Revision Changes Path
1.27 +6 -1 xml-xerces/c/src/xercesc/parsers/AbstractDOMParser.cpp
Index: AbstractDOMParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/AbstractDOMParser.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- AbstractDOMParser.cpp 26 Sep 2002 20:56:11 -0000 1.26
+++ AbstractDOMParser.cpp 4 Nov 2002 14:57:03 -0000 1.27
@@ -96,6 +96,9 @@
#include <xercesc/validators/common/ContentSpecNode.hpp>
#include <xercesc/validators/DTD/DTDAttDefList.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
// ---------------------------------------------------------------------------
// AbstractDOMParser: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -1384,4 +1387,6 @@
fCurrentEntity->setEncoding(encodingStr);
}
}
+
+XERCES_CPP_NAMESPACE_END
1.12 +6 -1 xml-xerces/c/src/xercesc/parsers/AbstractDOMParser.hpp
Index: AbstractDOMParser.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/AbstractDOMParser.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractDOMParser.hpp 14 Aug 2002 15:20:38 -0000 1.11
+++ AbstractDOMParser.hpp 4 Nov 2002 14:57:03 -0000 1.12
@@ -72,6 +72,9 @@
#include <xercesc/validators/DTD/DTDElementDecl.hpp>
#include <xercesc/framework/XMLBufferMgr.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLPScanToken;
class XMLScanner;
class XMLValidator;
@@ -1448,6 +1451,8 @@
{
fParseInProgress = toSet;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.13 +6 -1 xml-xerces/c/src/xercesc/parsers/DOMBuilderImpl.cpp
Index: DOMBuilderImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/DOMBuilderImpl.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DOMBuilderImpl.cpp 19 Jul 2002 14:58:29 -0000 1.12
+++ DOMBuilderImpl.cpp 4 Nov 2002 14:57:03 -0000 1.13
@@ -79,6 +79,9 @@
#include <xercesc/internal/XMLScanner.hpp>
#include <xercesc/framework/Wrapper4DOMInputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
// ---------------------------------------------------------------------------
// DOMBuilderImpl: Constructors and Destructor
@@ -591,4 +594,6 @@
{
return getScanner()->getURIText(uriId);
}
+
+XERCES_CPP_NAMESPACE_END
1.10 +7 -1 xml-xerces/c/src/xercesc/parsers/DOMBuilderImpl.hpp
Index: DOMBuilderImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/DOMBuilderImpl.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DOMBuilderImpl.hpp 15 Jul 2002 18:25:24 -0000 1.9
+++ DOMBuilderImpl.hpp 4 Nov 2002 14:57:03 -0000 1.10
@@ -65,6 +65,10 @@
#include <xercesc/parsers/AbstractDOMParser.hpp>
#include <xercesc/dom/DOMBuilder.hpp>
+#include <xercesc/util/XercesDefs.hpp>
+
+
+XERCES_CPP_NAMESPACE_BEGIN
/**
* Introduced in DOM Level 3
@@ -872,5 +876,7 @@
return fFilter;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.12 +9 -0 xml-xerces/c/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
Index: SAX2XMLReaderImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/SAX2XMLReaderImpl.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SAX2XMLReaderImpl.cpp 24 Sep 2002 20:00:32 -0000 1.11
+++ SAX2XMLReaderImpl.cpp 4 Nov 2002 14:57:03 -0000 1.12
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2002/11/04 14:57:03 tng
+ * C++ Namespace Support.
+ *
* Revision 1.11 2002/09/24 20:00:32 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -233,6 +236,9 @@
#include <xercesc/parsers/SAX2XMLReaderImpl.hpp>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
const XMLCh gDTDEntityStr[] =
{
chOpenSquare, chLatin_d, chLatin_t, chLatin_d, chCloseSquare, chNull
@@ -1571,3 +1577,6 @@
{
fScanner->resetCachedGrammarPool();
}
+
+XERCES_CPP_NAMESPACE_END
+
1.14 +9 -1 xml-xerces/c/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
Index: SAX2XMLReaderImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/SAX2XMLReaderImpl.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SAX2XMLReaderImpl.hpp 14 Aug 2002 15:20:38 -0000 1.13
+++ SAX2XMLReaderImpl.hpp 4 Nov 2002 14:57:03 -0000 1.14
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.14 2002/11/04 14:57:03 tng
+ * C++ Namespace Support.
+ *
* Revision 1.13 2002/08/14 15:20:38 knoaman
* [Bug 3111] Problem with LexicalHandler::startDTD() and LexicalHandler::endDTD().
*
@@ -190,6 +193,9 @@
#include <xercesc/util/ValueStackOf.hpp>
#include <xercesc/framework/XMLBufferMgr.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class ContentHandler;
class LexicalHandler;
class DeclHandler;
@@ -636,7 +642,7 @@
*
* @param uriId id of the string in the URI string pool.
* @return URI string corresponding to the URI id.
- */
+ */
virtual const XMLCh* getURIText(unsigned int uriId);
//@}
@@ -1810,5 +1816,7 @@
{
return fScanner->getURIText(uriId);
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.9 +8 -0 xml-xerces/c/src/xercesc/parsers/SAXParser.cpp
Index: SAXParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/SAXParser.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SAXParser.cpp 14 Aug 2002 15:20:38 -0000 1.8
+++ SAXParser.cpp 4 Nov 2002 14:57:03 -0000 1.9
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2002/11/04 14:57:03 tng
+ * C++ Namespace Support.
+ *
* Revision 1.8 2002/08/14 15:20:38 knoaman
* [Bug 3111] Problem with LexicalHandler::startDTD() and LexicalHandler::endDTD().
*
@@ -190,6 +193,8 @@
#include <xercesc/parsers/SAXParser.hpp>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// SAXParser: Constructors and Destructor
@@ -1255,3 +1260,6 @@
{
fScanner->resetCachedGrammarPool();
}
+
+XERCES_CPP_NAMESPACE_END
+
1.14 +9 -1 xml-xerces/c/src/xercesc/parsers/SAXParser.hpp
Index: SAXParser.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/SAXParser.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SAXParser.hpp 14 Aug 2002 15:20:38 -0000 1.13
+++ SAXParser.hpp 4 Nov 2002 14:57:03 -0000 1.14
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.14 2002/11/04 14:57:03 tng
+ * C++ Namespace Support.
+ *
* Revision 1.13 2002/08/14 15:20:38 knoaman
* [Bug 3111] Problem with LexicalHandler::startDTD() and LexicalHandler::endDTD().
*
@@ -187,6 +190,9 @@
#include <xercesc/framework/XMLErrorReporter.hpp>
#include <xercesc/validators/DTD/DocTypeHandler.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DocumentHandler;
class EntityResolver;
class XMLPScanToken;
@@ -491,7 +497,7 @@
*
* @param uriId id of the string in the URI string pool.
* @return URI string corresponding to the URI id.
- */
+ */
const XMLCh* getURIText(unsigned int uriId);
//@}
@@ -1896,5 +1902,7 @@
{
return *fScanner;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
1.8 +7 -1 xml-xerces/c/src/xercesc/parsers/XercesDOMParser.cpp
Index: XercesDOMParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/XercesDOMParser.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesDOMParser.cpp 11 Jul 2002 18:27:03 -0000 1.7
+++ XercesDOMParser.cpp 4 Nov 2002 14:57:03 -0000 1.8
@@ -75,6 +75,9 @@
#include <xercesc/internal/XMLScanner.hpp>
#include <xercesc/parsers/XercesDOMParser.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
// ---------------------------------------------------------------------------
// XercesDOMParser: Constructors and Destructor
@@ -318,3 +321,6 @@
{
getScanner()->resetCachedGrammarPool();
}
+
+XERCES_CPP_NAMESPACE_END
+
1.11 +7 -2 xml-xerces/c/src/xercesc/parsers/XercesDOMParser.hpp
Index: XercesDOMParser.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/XercesDOMParser.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XercesDOMParser.hpp 11 Jul 2002 18:27:03 -0000 1.10
+++ XercesDOMParser.hpp 4 Nov 2002 14:57:03 -0000 1.11
@@ -65,6 +65,9 @@
#include <xercesc/parsers/AbstractDOMParser.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class EntityResolver;
class ErrorHandler;
class Grammar;
@@ -195,7 +198,7 @@
*
* @param uriId id of the string in the URI string pool.
* @return URI string corresponding to the URI id.
- */
+ */
const XMLCh* getURIText(unsigned int uriId);
//@}
@@ -631,5 +634,7 @@
return fEntityResolver;
}
+
+XERCES_CPP_NAMESPACE_END
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
