diff --git a/src/xercesc/dom/DOMAttr.hpp b/src/xercesc/dom/DOMAttr.hpp
index 0b290044a4e628e9136ab3e923872399e5d8e714..518d5472c2d3072ea3ed5fcebdae0712d8271f78 100644
--- a/src/xercesc/dom/DOMAttr.hpp
+++ b/src/xercesc/dom/DOMAttr.hpp
@@ -65,6 +65,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOMNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
class DOMElement;
@@ -176,6 +178,8 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMBuilder.hpp b/src/xercesc/dom/DOMBuilder.hpp
index 79e11bcdde493a8470e04e66ef610c355e1089d6..f04720cfee47a9defaf88c56bb552f4ed1785bf1 100644
--- a/src/xercesc/dom/DOMBuilder.hpp
+++ b/src/xercesc/dom/DOMBuilder.hpp
@@ -65,6 +65,9 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMErrorHandler;
class DOMEntityResolver;
class DOMInputSource;
@@ -702,4 +705,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMCDATASection.hpp b/src/xercesc/dom/DOMCDATASection.hpp
index 05b21a6237ac912f9e62f3f917d31b3631b4cecd..12e330dbb5fcd6e1147c12ba27fb872540b167d0 100644
--- a/src/xercesc/dom/DOMCDATASection.hpp
+++ b/src/xercesc/dom/DOMCDATASection.hpp
@@ -65,6 +65,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOMText.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* CDATA sections are used to escape blocks of text containing characters that
@@ -126,6 +128,9 @@ public:
//@}
};
+
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMCharacterData.hpp b/src/xercesc/dom/DOMCharacterData.hpp
index 62c9a73ed10704cd886c77d60b6a05f48438f1b9..970e87f7af975f686b85059af349be6a5a78dc72 100644
--- a/src/xercesc/dom/DOMCharacterData.hpp
+++ b/src/xercesc/dom/DOMCharacterData.hpp
@@ -64,6 +64,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/dom/DOMNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* The <code>DOMCharacterData</code> interface extends DOMNode with a set of
@@ -238,6 +240,8 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMComment.hpp b/src/xercesc/dom/DOMComment.hpp
index ef281346aec9893a6de8498bbfa0f3ede3af8577..ff115d8462a06d1ef5fc8c90eb377aad95e1b5fe 100644
--- a/src/xercesc/dom/DOMComment.hpp
+++ b/src/xercesc/dom/DOMComment.hpp
@@ -65,6 +65,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOMCharacterData.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
/**
* This interface inherits from <code>CharacterData</code> and represents the
* content of a comment, i.e., all the characters between the starting '
@@ -100,5 +103,7 @@ public:
//@}
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMDocument.hpp b/src/xercesc/dom/DOMDocument.hpp
index 4420f676688091f95c8f6b792e3760597bba6887..ec505426493a91aeea882341aa501abb2965a400 100644
--- a/src/xercesc/dom/DOMDocument.hpp
+++ b/src/xercesc/dom/DOMDocument.hpp
@@ -66,6 +66,7 @@
#include "DOMDocumentRange.hpp"
#include "DOMDocumentTraversal.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
class DOMDocumentType;
class DOMElement;
@@ -1168,4 +1169,6 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMDocumentFragment.hpp b/src/xercesc/dom/DOMDocumentFragment.hpp
index 2dcbf6f69857ff47936ab3aee5d754124fd81037..952abbfc9afc8ee7eba7f74b957d5b3d3e52db92 100644
--- a/src/xercesc/dom/DOMDocumentFragment.hpp
+++ b/src/xercesc/dom/DOMDocumentFragment.hpp
@@ -65,6 +65,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOMNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* OMDocumentFragment is a "lightweight" or "minimal"
@@ -133,4 +135,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMDocumentRange.hpp b/src/xercesc/dom/DOMDocumentRange.hpp
index 5e4715e68283142f4b025c72c0c7a55f18480abf..bfcb997b9431b10dea15ca3129ca03625b0f6ad8 100644
--- a/src/xercesc/dom/DOMDocumentRange.hpp
+++ b/src/xercesc/dom/DOMDocumentRange.hpp
@@ -63,6 +63,9 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMRange;
@@ -118,4 +121,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMDocumentTraversal.hpp b/src/xercesc/dom/DOMDocumentTraversal.hpp
index 5198b5e0e62d122c33fcfab3e6baf68c257c11fb..ee2a491825a8ee8054b3631c63ee366b354ced45 100644
--- a/src/xercesc/dom/DOMDocumentTraversal.hpp
+++ b/src/xercesc/dom/DOMDocumentTraversal.hpp
@@ -63,6 +63,9 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMNode;
class DOMNodeFilter;
class DOMNodeIterator;
@@ -178,4 +181,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMDocumentType.hpp b/src/xercesc/dom/DOMDocumentType.hpp
index efcec5c2bc6c6305b4d369988eacc731b996c88e..6dbe4a6f9664f1ee30038b1e15d645318a6b5e79 100644
--- a/src/xercesc/dom/DOMDocumentType.hpp
+++ b/src/xercesc/dom/DOMDocumentType.hpp
@@ -65,6 +65,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOMNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMNamedNodeMap;
/**
@@ -182,6 +185,8 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMElement.hpp b/src/xercesc/dom/DOMElement.hpp
index d9b3027d8967370e19fb152550d86324b2b64285..df717e00487c8050c83e9f9cc561caf502614c5b 100644
--- a/src/xercesc/dom/DOMElement.hpp
+++ b/src/xercesc/dom/DOMElement.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOMNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMAttr;
class DOMNodeList;
@@ -414,6 +417,8 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMEntity.hpp b/src/xercesc/dom/DOMEntity.hpp
index b3faa418f0ec452c6ab453888b9e8fc6580f6c12..aa09412b752b002fe31303a7c8bc57856703c6dc 100644
--- a/src/xercesc/dom/DOMEntity.hpp
+++ b/src/xercesc/dom/DOMEntity.hpp
@@ -65,6 +65,7 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOMNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
/**
* This interface represents an entity, either parsed or unparsed, in an XML
@@ -232,5 +233,7 @@ public:
//@}
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMEntityReference.hpp b/src/xercesc/dom/DOMEntityReference.hpp
index de263adcabb251fb2345e6620d36966301925f82..2956f5fbcd546207ad308d5b10e06ab6c9a41d19 100644
--- a/src/xercesc/dom/DOMEntityReference.hpp
+++ b/src/xercesc/dom/DOMEntityReference.hpp
@@ -65,6 +65,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOMNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* <code>DOMEntityReference</code> objects may be inserted into the structure
@@ -119,6 +121,8 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMEntityResolver.hpp b/src/xercesc/dom/DOMEntityResolver.hpp
index c18d60eb3723b5d9cade02f646a4f6e89524e888..fb0497bba9967c1decdc496f3828ef9b4394e654 100644
--- a/src/xercesc/dom/DOMEntityResolver.hpp
+++ b/src/xercesc/dom/DOMEntityResolver.hpp
@@ -59,6 +59,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 15:09:24 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/08/22 15:04:57 tng
* Remove unused parameter variables in inline functions.
*
@@ -76,6 +79,9 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMInputSource;
/**
@@ -182,4 +188,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMError.hpp b/src/xercesc/dom/DOMError.hpp
index 2cc554ecc50589300ceebf67997a3b5dee16fc8c..6e8620983edece3ce329ca5b70aa545fd79b13a5 100644
--- a/src/xercesc/dom/DOMError.hpp
+++ b/src/xercesc/dom/DOMError.hpp
@@ -59,6 +59,9 @@
/*
* $Log$
+ * Revision 1.7 2002/11/04 15:09:24 tng
+ * C++ Namespace Support.
+ *
* Revision 1.6 2002/08/22 15:04:57 tng
* Remove unused parameter variables in inline functions.
*
@@ -82,6 +85,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class DOMLocator;
@@ -236,4 +241,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMErrorHandler.hpp b/src/xercesc/dom/DOMErrorHandler.hpp
index f639a3c9e2f23ff79d6b970d35bacdb3f434904f..b371b331f0222f7a2a88a342552d8a73f262d014 100644
--- a/src/xercesc/dom/DOMErrorHandler.hpp
+++ b/src/xercesc/dom/DOMErrorHandler.hpp
@@ -59,6 +59,9 @@
/*
* $Log$
+ * Revision 1.6 2002/11/04 15:09:24 tng
+ * C++ Namespace Support.
+ *
* Revision 1.5 2002/08/22 15:04:57 tng
* Remove unused parameter variables in inline functions.
*
@@ -79,6 +82,9 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMError;
/**
@@ -147,4 +153,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMException.cpp b/src/xercesc/dom/DOMException.cpp
index 81fef84f3df446697b0914f803f6f1640768995c..68011c7dcfd9f36c26ad96e7ba15acf89f64071a 100644
--- a/src/xercesc/dom/DOMException.cpp
+++ b/src/xercesc/dom/DOMException.cpp
@@ -60,6 +60,8 @@
#include "DOMException.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
DOMException::DOMException()
: msg(0)
@@ -85,3 +87,6 @@ DOMException::DOMException(const DOMException &other)
DOMException::~DOMException()
{
};
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/DOMException.hpp b/src/xercesc/dom/DOMException.hpp
index ea01eda58d85296046595a8410dc28a91a4055f6..e6af66d626395893df3ec49caea922f41912c16f 100644
--- a/src/xercesc/dom/DOMException.hpp
+++ b/src/xercesc/dom/DOMException.hpp
@@ -63,6 +63,9 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
/**
* DOM operations only raise exceptions in "exceptional" circumstances, i.e.,
* when an operation is impossible to perform (either for logical reasons,
@@ -246,5 +249,7 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMImplementation.hpp b/src/xercesc/dom/DOMImplementation.hpp
index 8afbc798f16bd7589aa929f724f954301e35ae3c..1484ccc71ea8ff534f6dae62fe7c2d26496760b3 100644
--- a/src/xercesc/dom/DOMImplementation.hpp
+++ b/src/xercesc/dom/DOMImplementation.hpp
@@ -63,6 +63,9 @@
#include <xercesc/dom/DOMImplementationLS.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMDocument;
class DOMDocumentType;
@@ -254,4 +257,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMImplementationLS.hpp b/src/xercesc/dom/DOMImplementationLS.hpp
index 412b239ec758c67d99f62f64bebc708809eff6cb..05c9604a7162f506638720a01a7b61a77b4a7061 100644
--- a/src/xercesc/dom/DOMImplementationLS.hpp
+++ b/src/xercesc/dom/DOMImplementationLS.hpp
@@ -59,6 +59,9 @@
/*
* $Log$
+ * Revision 1.6 2002/11/04 15:09:24 tng
+ * C++ Namespace Support.
+ *
* Revision 1.5 2002/08/22 15:04:57 tng
* Remove unused parameter variables in inline functions.
*
@@ -79,6 +82,9 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMBuilder;
class DOMWriter;
class DOMInputSource;
@@ -212,4 +218,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMImplementationRegistry.hpp b/src/xercesc/dom/DOMImplementationRegistry.hpp
index b813ac804f2e344ef45db10f44c34986f123290c..f8d00aad78e0a55ce589d4799c0eab891500edef 100644
--- a/src/xercesc/dom/DOMImplementationRegistry.hpp
+++ b/src/xercesc/dom/DOMImplementationRegistry.hpp
@@ -74,6 +74,11 @@
* @since DOM Level 3
*/
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMImplementation;
class DOMImplementationSource;
@@ -115,4 +120,6 @@ public:
//@}
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMImplementationSource.hpp b/src/xercesc/dom/DOMImplementationSource.hpp
index c46204cb642628c093221aeda76bb405dd323a93..edde4e6a9c762864fe2001cee1e09ace7c32963a 100644
--- a/src/xercesc/dom/DOMImplementationSource.hpp
+++ b/src/xercesc/dom/DOMImplementationSource.hpp
@@ -71,6 +71,10 @@
*
* @since DOM Level 3
*/
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
class DOMImplementation;
@@ -124,4 +128,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMInputSource.hpp b/src/xercesc/dom/DOMInputSource.hpp
index 2b7fc76ca00ca65c4686c13c2e3c35f819244986..cb53dc016c972fd0ae868594fa7b39b5000798a7 100644
--- a/src/xercesc/dom/DOMInputSource.hpp
+++ b/src/xercesc/dom/DOMInputSource.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class BinInputStream;
@@ -303,4 +306,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMLocator.hpp b/src/xercesc/dom/DOMLocator.hpp
index e20e383161f25b0af5c01cb407e8004902fc8617..e3069c4e77477d53f7242e4848c51774b4650adf 100644
--- a/src/xercesc/dom/DOMLocator.hpp
+++ b/src/xercesc/dom/DOMLocator.hpp
@@ -59,6 +59,9 @@
/*
* $Log$
+ * Revision 1.6 2002/11/04 15:09:24 tng
+ * C++ Namespace Support.
+ *
* Revision 1.5 2002/08/22 15:04:57 tng
* Remove unused parameter variables in inline functions.
*
@@ -78,6 +81,9 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMNode;
@@ -246,4 +252,6 @@ public:
//@}
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMNamedNodeMap.hpp b/src/xercesc/dom/DOMNamedNodeMap.hpp
index 78ccf5648fd3639e4710a8cb89dac0600eefe87d..f9dc6cd851e8e9340a85cc820ab8d0f503c28603 100644
--- a/src/xercesc/dom/DOMNamedNodeMap.hpp
+++ b/src/xercesc/dom/DOMNamedNodeMap.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMNode;
/**
@@ -268,5 +271,7 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMNode.hpp b/src/xercesc/dom/DOMNode.hpp
index e109b4ddd5c65cb5b715edf838dfa012a21f3603..fd21aa2bcee71162ab99ddc32fd155e7c3cc37b0 100644
--- a/src/xercesc/dom/DOMNode.hpp
+++ b/src/xercesc/dom/DOMNode.hpp
@@ -63,6 +63,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class DOMDocument;
class DOMNamedNodeMap;
@@ -983,5 +985,7 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMNodeFilter.hpp b/src/xercesc/dom/DOMNodeFilter.hpp
index 4ccb1d6b3114c72125f62e6c472a729dbc23280e..705ad496b73fdeee081b0571e2ae6cc9d0cae871 100644
--- a/src/xercesc/dom/DOMNodeFilter.hpp
+++ b/src/xercesc/dom/DOMNodeFilter.hpp
@@ -63,6 +63,8 @@
#include "DOMNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* Filters are objects that know how to "filter out" nodes. If a
@@ -242,4 +244,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMNodeIterator.hpp b/src/xercesc/dom/DOMNodeIterator.hpp
index 04033ff999b557a25c589d64d14801cc99d970ee..cefdb6a2f18add12dcc551edbc21ba25ac974efe 100644
--- a/src/xercesc/dom/DOMNodeIterator.hpp
+++ b/src/xercesc/dom/DOMNodeIterator.hpp
@@ -64,6 +64,9 @@
#include "DOMNodeFilter.hpp"
#include "DOMNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
/**
* <code>DOMNodeIterators</code> are used to step through a set of nodes, e.g.
* the set of nodes in a <code>DOMNodeList</code>, the document subtree
@@ -217,4 +220,6 @@ public:
//@}
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMNodeList.hpp b/src/xercesc/dom/DOMNodeList.hpp
index c883f9e2c7733e83ef631ffd5d7c502a63a26d9c..6a524d3d6b23a7d5ab858d562ff521e1c60ba7d9 100644
--- a/src/xercesc/dom/DOMNodeList.hpp
+++ b/src/xercesc/dom/DOMNodeList.hpp
@@ -63,6 +63,9 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMNode;
@@ -135,6 +138,8 @@ public:
//@}
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMNotation.hpp b/src/xercesc/dom/DOMNotation.hpp
index 517129366ac8af386736c3d9355ecf9bf11cf94f..a8e95c415ae0dd20af12ad6945ace8ba8835294c 100644
--- a/src/xercesc/dom/DOMNotation.hpp
+++ b/src/xercesc/dom/DOMNotation.hpp
@@ -64,6 +64,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOMNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* This interface represents a notation declared in the DTD. A notation either
@@ -136,6 +138,8 @@ public:
//@}
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMProcessingInstruction.hpp b/src/xercesc/dom/DOMProcessingInstruction.hpp
index f629e9b288bcbaa13b9ea750fbc4da66ad427b46..3188439061689320c511c928d5c0c4be1e858587 100644
--- a/src/xercesc/dom/DOMProcessingInstruction.hpp
+++ b/src/xercesc/dom/DOMProcessingInstruction.hpp
@@ -65,6 +65,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOMNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* The <code>DOMProcessingInstruction</code> interface represents a "processing
@@ -145,5 +147,7 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMRange.hpp b/src/xercesc/dom/DOMRange.hpp
index 7ca3922cc8f741ed61214694efe0f8b2d6353793..42926213c7a281eca1e808bcd8ad39c85c299987 100644
--- a/src/xercesc/dom/DOMRange.hpp
+++ b/src/xercesc/dom/DOMRange.hpp
@@ -63,6 +63,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class DOMNode;
class DOMDocumentFragment;
@@ -554,4 +556,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMRangeException.cpp b/src/xercesc/dom/DOMRangeException.cpp
index e1cde86c4087a431e2c9ccdf395fef815afd22eb..0c16468c6dd9d508d02cad7569db560b30ac619d 100644
--- a/src/xercesc/dom/DOMRangeException.cpp
+++ b/src/xercesc/dom/DOMRangeException.cpp
@@ -60,6 +60,8 @@
#include "DOMRangeException.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
DOMRangeException::DOMRangeException()
: DOMException()
@@ -86,3 +88,5 @@ DOMRangeException::~DOMRangeException()
{
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/DOMRangeException.hpp b/src/xercesc/dom/DOMRangeException.hpp
index 6c8a243cefd6ec09f0885a09c44803bfb267190b..6fe4eb9ac3d4e2aaeb076429554799cf2bacb89d 100644
--- a/src/xercesc/dom/DOMRangeException.hpp
+++ b/src/xercesc/dom/DOMRangeException.hpp
@@ -63,6 +63,8 @@
#include <xercesc/dom/DOMException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* Range operations may throw a <code>DOMRangeException</code> as specified in
* their method descriptions.
@@ -153,5 +155,7 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMText.hpp b/src/xercesc/dom/DOMText.hpp
index fe595cb027837b23913c84b22544db7d0d0dd4ab..29fec09b89da0ccd22ae4aede85b7721a172637f 100644
--- a/src/xercesc/dom/DOMText.hpp
+++ b/src/xercesc/dom/DOMText.hpp
@@ -64,6 +64,7 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOMCharacterData.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
/**
@@ -212,6 +213,8 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMTreeWalker.hpp b/src/xercesc/dom/DOMTreeWalker.hpp
index c749babe350298337700de2ac200439ad5fd4b72..7da71d340184b69cc8af31453c32f45883fe8684 100644
--- a/src/xercesc/dom/DOMTreeWalker.hpp
+++ b/src/xercesc/dom/DOMTreeWalker.hpp
@@ -64,6 +64,8 @@
#include "DOMNode.hpp"
#include "DOMNodeFilter.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* <code>DOMTreeWalker</code> objects are used to navigate a document tree or
@@ -298,4 +300,6 @@ public:
//@}
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMUserDataHandler.hpp b/src/xercesc/dom/DOMUserDataHandler.hpp
index 0f1bc08e70da3313c897d5704338040c4b7754e2..3246a3f3568f3771799721e06205176d21519cff 100644
--- a/src/xercesc/dom/DOMUserDataHandler.hpp
+++ b/src/xercesc/dom/DOMUserDataHandler.hpp
@@ -64,6 +64,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/dom/DOMNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* When associating an object to a key on a node using <code>setUserData</code>
* the application can provide a handler that gets called when the node the
@@ -164,5 +166,7 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMWriter.hpp b/src/xercesc/dom/DOMWriter.hpp
index 9df7daa39ef44343e5dcce0e12aa3ec172173574..150661452f70d700d0db93565b84b8b378c3a899 100644
--- a/src/xercesc/dom/DOMWriter.hpp
+++ b/src/xercesc/dom/DOMWriter.hpp
@@ -60,6 +60,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2002/11/04 15:09:25 tng
+ * C++ Namespace Support.
+ *
* Revision 1.7 2002/08/22 15:04:57 tng
* Remove unused parameter variables in inline functions.
*
@@ -308,6 +311,8 @@
#include <xercesc/dom/DOMErrorHandler.hpp>
#include <xercesc/framework/XMLFormatter.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class CDOM_EXPORT DOMWriter {
protected :
// -----------------------------------------------------------------------
@@ -595,4 +600,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/DOMWriterFilter.hpp b/src/xercesc/dom/DOMWriterFilter.hpp
index e872d09d5b14ab342c9839a1b699dff24c9b525c..ba5deeec992db8c9d9928e03bfd077b3d3f64e6c 100644
--- a/src/xercesc/dom/DOMWriterFilter.hpp
+++ b/src/xercesc/dom/DOMWriterFilter.hpp
@@ -60,6 +60,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2002/11/04 15:09:25 tng
+ * C++ Namespace Support.
+ *
* Revision 1.7 2002/08/22 15:04:57 tng
* Remove unused parameter variables in inline functions.
*
@@ -103,6 +106,9 @@
#include <xercesc/dom/DOMNodeFilter.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CDOM_EXPORT DOMWriterFilter : public DOMNodeFilter {
protected :
// -----------------------------------------------------------------------
@@ -194,4 +200,6 @@ private:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/AttrImpl.cpp b/src/xercesc/dom/deprecated/AttrImpl.cpp
index c30cd2ab953d157644af19d3e6a23c1373a300b5..beb91e4d5df3c00b85e8e0f96cf80a9b833624b3 100644
--- a/src/xercesc/dom/deprecated/AttrImpl.cpp
+++ b/src/xercesc/dom/deprecated/AttrImpl.cpp
@@ -70,6 +70,9 @@
#include "NodeIDMap.hpp"
#include "RangeImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
/*
* The handling of the value field being either the first child node (a
* ChildNode*) or directly the value (a DOMString) is rather tricky. In the
@@ -687,3 +690,6 @@ void AttrImpl::normalize()
// changed() will have occurred when the removeChild() was done,
// so does not have to be reissued.
};
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/AttrImpl.hpp b/src/xercesc/dom/deprecated/AttrImpl.hpp
index f67fb475bd9d569fdb19ee9570d062f7d17c8d03..ebb27dff0f092472115750f2d976441a7c223f00 100644
--- a/src/xercesc/dom/deprecated/AttrImpl.hpp
+++ b/src/xercesc/dom/deprecated/AttrImpl.hpp
@@ -142,6 +142,9 @@
#include "ChildNode.hpp"
#include "DOM_Node.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class ElementImpl;
class CDOM_EXPORT AttrImpl: public NodeImpl {
@@ -197,4 +200,6 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/AttrMapImpl.cpp b/src/xercesc/dom/deprecated/AttrMapImpl.cpp
index 3c267977315659ff50d2ce6978edea45f7949853..538245578dd58784d5477cac3b9fa3273f2958dc 100644
--- a/src/xercesc/dom/deprecated/AttrMapImpl.cpp
+++ b/src/xercesc/dom/deprecated/AttrMapImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -64,6 +64,9 @@
#include "NodeImpl.hpp"
#include "ElementImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
AttrMapImpl::AttrMapImpl(NodeImpl *ownerNod)
: NamedNodeMapImpl(ownerNod)
{
@@ -74,14 +77,14 @@ AttrMapImpl::AttrMapImpl(NodeImpl *ownerNod, NamedNodeMapImpl *defaults)
: NamedNodeMapImpl(ownerNod)
{
hasDefaults(false);
- if (defaults != null)
+ if (defaults != null)
{
- if (defaults->getLength() > 0)
+ if (defaults->getLength() > 0)
{
hasDefaults(true);
cloneContent(defaults);
}
- }
+ }
}
AttrMapImpl::~AttrMapImpl()
@@ -135,3 +138,6 @@ NodeImpl *AttrMapImpl::removeNamedItemNS(const DOMString &namespaceURI, const DO
return removed;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/AttrMapImpl.hpp b/src/xercesc/dom/deprecated/AttrMapImpl.hpp
index bd9ff292ce5e1cf0b152419c29a0419f5bd45743..dc9766eb057850002e7f54d305f96ed7f925ce3b 100644
--- a/src/xercesc/dom/deprecated/AttrMapImpl.hpp
+++ b/src/xercesc/dom/deprecated/AttrMapImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -48,7 +48,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -75,9 +75,12 @@
#include "NodeImpl.hpp"
#include "NamedNodeMapImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class NamedNodeMapImpl;
-class CDOM_EXPORT AttrMapImpl : public NamedNodeMapImpl
+class CDOM_EXPORT AttrMapImpl : public NamedNodeMapImpl
{
private:
bool attrDefaults;
@@ -109,4 +112,6 @@ inline void AttrMapImpl::hasDefaults(bool value)
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/AttrNSImpl.cpp b/src/xercesc/dom/deprecated/AttrNSImpl.cpp
index 1bfb450b2b045b522e1c326e6abad0b88be6c09f..b0aa6e21bf5faacbf6b75d7e05bc3361a8f6d854 100644
--- a/src/xercesc/dom/deprecated/AttrNSImpl.cpp
+++ b/src/xercesc/dom/deprecated/AttrNSImpl.cpp
@@ -63,6 +63,9 @@
#include "DocumentImpl.hpp"
#include "DOM_DOMException.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
AttrNSImpl::AttrNSImpl(DocumentImpl *ownerDoc, const DOMString &nam) :
AttrImpl(ownerDoc, nam)
@@ -173,3 +176,6 @@ void AttrNSImpl::setPrefix(const DOMString &prefix)
name = prefix + chColon + localName; //nodeName is changed too
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/AttrNSImpl.hpp b/src/xercesc/dom/deprecated/AttrNSImpl.hpp
index ca8a34e8b92495e38e63242a6e80a8886a91087c..bc8e5be782d2c53c86179124a2306684c852a0ab 100644
--- a/src/xercesc/dom/deprecated/AttrNSImpl.hpp
+++ b/src/xercesc/dom/deprecated/AttrNSImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -48,7 +48,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -73,20 +73,23 @@
#include "AttrImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CDOM_EXPORT AttrNSImpl: public AttrImpl {
protected:
//Introduced in DOM Level 2
DOMString namespaceURI; //namespace URI of this node
DOMString localName; //local part of qualified name
-
-
+
+
public:
AttrNSImpl(DocumentImpl *ownerDoc, const DOMString &name);
AttrNSImpl(DocumentImpl *ownerDoc, //DOM Level 2
const DOMString &namespaceURI, const DOMString &qualifiedName);
AttrNSImpl(const AttrNSImpl &other, bool deep=false);
-
+
virtual NodeImpl * cloneNode(bool deep);
//Introduced in DOM Level 2
virtual DOMString getNamespaceURI();
@@ -95,4 +98,6 @@ public:
virtual void setPrefix(const DOMString &prefix);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/CDATASectionImpl.cpp b/src/xercesc/dom/deprecated/CDATASectionImpl.cpp
index fa8e6389bd5c459a9a1698589147099c8ac5322b..7bffc1dba5aafcef02bead45e5b2898fa70051f0 100644
--- a/src/xercesc/dom/deprecated/CDATASectionImpl.cpp
+++ b/src/xercesc/dom/deprecated/CDATASectionImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -63,6 +63,9 @@
#include "DocumentImpl.hpp"
#include "DStringPool.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
static DOMString *gcdata_section = 0; // will be lazily initialized
static XMLRegisterCleanup gcdata_sectionCleanup;
@@ -87,7 +90,7 @@ CDATASectionImpl::~CDATASectionImpl()
NodeImpl *CDATASectionImpl::cloneNode(bool deep)
{
return new CDATASectionImpl(*this, deep);
-};
+};
DOMString CDATASectionImpl::getNodeName() {
@@ -116,3 +119,6 @@ void CDATASectionImpl::reinitCDATASectionImpl() {
delete gcdata_section;
gcdata_section = 0;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/CDATASectionImpl.hpp b/src/xercesc/dom/deprecated/CDATASectionImpl.hpp
index 98a0380561078dd250617e9311142fb18a47b52d..acab5b1320f104fa14e682c0fafe380511105ae3 100644
--- a/src/xercesc/dom/deprecated/CDATASectionImpl.hpp
+++ b/src/xercesc/dom/deprecated/CDATASectionImpl.hpp
@@ -2,38 +2,38 @@
#define CDATASectionImpl_HEADER_GUARD_
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -47,7 +47,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -73,12 +73,14 @@
#include <xercesc/util/XercesDefs.hpp>
#include "TextImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
class CDOM_EXPORT CDATASectionImpl: public TextImpl {
public:
CDATASectionImpl(DocumentImpl *ownerDoc, const DOMString & data);
CDATASectionImpl(const CDATASectionImpl &other, bool deep = false);
-
+
virtual ~CDATASectionImpl();
virtual NodeImpl *cloneNode(bool deep);
virtual DOMString getNodeName();
@@ -91,5 +93,7 @@ public:
static void reinitCDATASectionImpl();
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/CharacterDataImpl.cpp b/src/xercesc/dom/deprecated/CharacterDataImpl.cpp
index be526715d732b7037d433cf734a7d8cd49b5ffeb..5cb5aa4433b6491f16c112b47f0ccf93f1fbefd7 100644
--- a/src/xercesc/dom/deprecated/CharacterDataImpl.cpp
+++ b/src/xercesc/dom/deprecated/CharacterDataImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -63,6 +63,8 @@
#include "RangeImpl.hpp"
#include "DocumentImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
CharacterDataImpl::CharacterDataImpl(DocumentImpl *ownerDoc,
const DOMString &dat)
@@ -115,7 +117,7 @@ void CharacterDataImpl::appendData(const DOMString &dat)
if(isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
-
+
this->data.appendData(dat);
};
@@ -128,7 +130,7 @@ void CharacterDataImpl::deleteData(unsigned int offset, unsigned int count)
// Note: the C++ DOMString operation throws the correct DOMExceptions
// when parameter values are bad.
- //
+ //
data.deleteData(offset, count);
if (this->getOwnerDocument() != null) {
@@ -150,7 +152,7 @@ void CharacterDataImpl::deleteData(unsigned int offset, unsigned int count)
DOMString &CharacterDataImpl::getData()
{
- return data;
+ return data;
};
@@ -166,21 +168,21 @@ DOMString &CharacterDataImpl::getData()
//
unsigned int CharacterDataImpl::getCharDataLength()
{
- return data.length();
+ return data.length();
};
-void CharacterDataImpl::insertData(unsigned int offset, const DOMString &dat)
+void CharacterDataImpl::insertData(unsigned int offset, const DOMString &dat)
{
-
+
if (isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
-
+
// Note: the C++ DOMString operation throws the correct DOMExceptions
// when parameter values are bad.
- //
+ //
this->data.insertData(offset, dat);
}
@@ -217,7 +219,9 @@ DOMString CharacterDataImpl::substringData(unsigned int offset,
// Note: the C++ DOMString operation throws the correct DOMExceptions
// when parameter values are bad.
- //
+ //
return data.substringData(offset, count);
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/CharacterDataImpl.hpp b/src/xercesc/dom/deprecated/CharacterDataImpl.hpp
index 8240bb7997bfeb596b0c1d3512922bdf4392a37a..774d1efab1340ff1e87cd8d4715211f995d02126 100644
--- a/src/xercesc/dom/deprecated/CharacterDataImpl.hpp
+++ b/src/xercesc/dom/deprecated/CharacterDataImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -48,7 +48,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -74,6 +74,9 @@
#include "ChildNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CDOM_EXPORT CharacterDataImpl: public ChildNode
{
protected:
@@ -93,8 +96,10 @@ public:
virtual void replaceData(unsigned int offset, unsigned int count, const DOMString &data);
virtual void setData(const DOMString &arg);
virtual DOMString substringData(unsigned int offset, unsigned int count);
-
+
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/ChildNode.cpp b/src/xercesc/dom/deprecated/ChildNode.cpp
index e4c0b9ad3ab4295ac41b69ab950374ffb4ca9243..468da2802fbb1b8825dd6b2170b69f05c38e63e0 100644
--- a/src/xercesc/dom/deprecated/ChildNode.cpp
+++ b/src/xercesc/dom/deprecated/ChildNode.cpp
@@ -62,6 +62,9 @@
#include "ChildNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
ChildNode::ChildNode(DocumentImpl *ownerDoc)
: NodeImpl(ownerDoc)
{
@@ -99,3 +102,6 @@ NodeImpl * ChildNode::getPreviousSibling() {
// parent's lastChild, but we hide that
return isFirstChild() ? null : previousSibling;
};
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/ChildNode.hpp b/src/xercesc/dom/deprecated/ChildNode.hpp
index e0c264a84ee9801d0711c3255453e7d2f8847797..536fb7c5b2ba7e03b43564ce7497510c3d75efbd 100644
--- a/src/xercesc/dom/deprecated/ChildNode.hpp
+++ b/src/xercesc/dom/deprecated/ChildNode.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -48,7 +48,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -77,6 +77,9 @@
#include "NodeImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CDOM_EXPORT ChildNode: public NodeImpl {
public:
ChildNode *previousSibling;
@@ -86,11 +89,13 @@ public:
ChildNode(DocumentImpl *ownerDocument);
ChildNode(const ChildNode &other);
virtual ~ChildNode();
-
+
virtual NodeImpl * getNextSibling();
virtual NodeImpl * getParentNode();
virtual NodeImpl* getPreviousSibling();
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/CommentImpl.cpp b/src/xercesc/dom/deprecated/CommentImpl.cpp
index 1a2c4a07afef485bcb596df02ea37e729db0b857..3f499f8d66c834ff793581e180a37ca77f330bf1 100644
--- a/src/xercesc/dom/deprecated/CommentImpl.cpp
+++ b/src/xercesc/dom/deprecated/CommentImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -62,7 +62,7 @@
* Represents an XML (or HTML) comment.
*
* @author Rania Y. Khalaf
- * @author Joseph Kesselman
+ * @author Joseph Kesselman
* @since PR-DOM-Level-1-19980818.
*/
@@ -72,6 +72,9 @@
#include "DocumentImpl.hpp"
#include "DStringPool.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
static DOMString *gComment = 0; // will be lazily initialized to "#comment"
static XMLRegisterCleanup gCommentCleanup;
@@ -116,3 +119,6 @@ void CommentImpl::reinitCommentImpl() {
delete gComment;
gComment = 0;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/CommentImpl.hpp b/src/xercesc/dom/deprecated/CommentImpl.hpp
index d2ab81010d899b9f64bd9de94bfb2e8cddd0d576..2dc8f5402cce0f42cf7d25f9b2334528b9804e25 100644
--- a/src/xercesc/dom/deprecated/CommentImpl.hpp
+++ b/src/xercesc/dom/deprecated/CommentImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -48,7 +48,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -75,6 +75,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "CharacterDataImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CDOM_EXPORT CommentImpl: public CharacterDataImpl {
public:
CommentImpl(DocumentImpl *, const DOMString &);
@@ -90,5 +93,7 @@ public:
static void reinitCommentImpl();
};
+XERCES_CPP_NAMESPACE_END
+
#endif
-
+
diff --git a/src/xercesc/dom/deprecated/DOMParser.cpp b/src/xercesc/dom/deprecated/DOMParser.cpp
index 7255e1cecbbb100698060330f91428cc1cd55db4..593eb9a0eb78155e0d59ec1ffff438d0e0164ee8 100644
--- a/src/xercesc/dom/deprecated/DOMParser.cpp
+++ b/src/xercesc/dom/deprecated/DOMParser.cpp
@@ -92,6 +92,9 @@
#include <xercesc/validators/common/ContentSpecNode.hpp>
#include <xercesc/validators/DTD/DTDAttDefList.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
// ---------------------------------------------------------------------------
// DOMParser: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -1340,3 +1343,5 @@ void DOMParser::resetCachedGrammarPool()
fScanner->resetCachedGrammarPool();
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOMParser.hpp b/src/xercesc/dom/deprecated/DOMParser.hpp
index cce6b4640a660d4c4aa6f19bf2738a0149e1e4f3..e90bd19c12c515d537162020aecf46d84a3cff7f 100644
--- a/src/xercesc/dom/deprecated/DOMParser.hpp
+++ b/src/xercesc/dom/deprecated/DOMParser.hpp
@@ -73,6 +73,9 @@
#include "DOM_Document.hpp"
#include "DOM_DocumentType.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class EntityResolver;
class ErrorHandler;
class XMLPScanToken;
@@ -418,7 +421,7 @@ public :
*
* @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);
//@}
@@ -1799,4 +1802,6 @@ inline void DOMParser::setDocument(DOM_Document toSet)
fDocument = toSet;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOMString.cpp b/src/xercesc/dom/deprecated/DOMString.cpp
index e3a913386f1382d4085a9864e85ed11e6f488518..b8ace31d3745b4c9ebb14441b72e7f145e69b84f 100644
--- a/src/xercesc/dom/deprecated/DOMString.cpp
+++ b/src/xercesc/dom/deprecated/DOMString.cpp
@@ -74,7 +74,7 @@
#include <assert.h>
#include <string.h>
-
+XERCES_CPP_NAMESPACE_BEGIN
//----------------------------------------------
//
@@ -1144,5 +1144,5 @@ static void reinitDomMutex()
};
-
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/deprecated/DOMString.hpp b/src/xercesc/dom/deprecated/DOMString.hpp
index 14d5249820eb5c151d7e868f0b9fd66e52ea29ed..69a3ed40317c0c36798d46719f24408e97a5d527 100644
--- a/src/xercesc/dom/deprecated/DOMString.hpp
+++ b/src/xercesc/dom/deprecated/DOMString.hpp
@@ -65,7 +65,9 @@
#ifdef XML_DEBUG
#include "DOMStringImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
#else
+XERCES_CPP_NAMESPACE_BEGIN
class DOMStringHandle;
#endif
@@ -479,4 +481,6 @@ DOMString CDOM_EXPORT operator + (const DOMString &lhs, XMLCh rhs);
*/
DOMString CDOM_EXPORT operator + (XMLCh lhs, const DOMString &rhs);
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOMStringImpl.hpp b/src/xercesc/dom/deprecated/DOMStringImpl.hpp
index fedcc2c06d7097b66d105fb495950ba9448aba3f..cffdee17c493373e63e852d9a82717709e62cd7d 100644
--- a/src/xercesc/dom/deprecated/DOMStringImpl.hpp
+++ b/src/xercesc/dom/deprecated/DOMStringImpl.hpp
@@ -76,6 +76,7 @@
#include <xercesc/util/Mutexes.hpp>
#include <stdio.h>
+XERCES_CPP_NAMESPACE_BEGIN
class DOMStringData
{
@@ -120,6 +121,7 @@ private:
static inline XMLMutex &getMutex();
};
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_Attr.cpp b/src/xercesc/dom/deprecated/DOM_Attr.cpp
index 31cbf8dce98d479e6060ed5ee16b31b60c49c3ef..e95021aad46e46aa25cca87384537f58beb778fb 100644
--- a/src/xercesc/dom/deprecated/DOM_Attr.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Attr.cpp
@@ -61,6 +61,9 @@
#include "DOM_Attr.hpp"
#include "AttrImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
DOM_Attr::DOM_Attr()
: DOM_Node(null)
@@ -131,3 +134,6 @@ DOM_Element DOM_Attr::getOwnerElement() const
{
return DOM_Element(((AttrImpl *)fImpl)->getOwnerElement());
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_Attr.hpp b/src/xercesc/dom/deprecated/DOM_Attr.hpp
index 9ad72ff7cee4fd41e0b2b51db688afdce6e78def..85ebe8690ea4d9b5dfc610def575af5b677e88d6 100644
--- a/src/xercesc/dom/deprecated/DOM_Attr.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Attr.hpp
@@ -65,6 +65,9 @@
#include "DOM_Node.hpp"
#include "DOM_Element.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class AttrImpl;
/**
@@ -205,6 +208,8 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_CDATASection.cpp b/src/xercesc/dom/deprecated/DOM_CDATASection.cpp
index fc21e03b0c5ac6a380aedcf998719f71e263479d..342641ccbd44d5c41b97d76bf1f30e24ca101b55 100644
--- a/src/xercesc/dom/deprecated/DOM_CDATASection.cpp
+++ b/src/xercesc/dom/deprecated/DOM_CDATASection.cpp
@@ -62,6 +62,7 @@
#include "DOM_Text.hpp"
#include "CDATASectionImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
DOM_CDATASection::DOM_CDATASection()
@@ -99,3 +100,5 @@ DOM_CDATASection & DOM_CDATASection::operator = (const DOM_NullPtr *other)
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_CDATASection.hpp b/src/xercesc/dom/deprecated/DOM_CDATASection.hpp
index c8cf6fba67cd0407cb13afe018c483791dd261d0..255d4db0acb430e8ee85aa8a49f96e3f2331788c 100644
--- a/src/xercesc/dom/deprecated/DOM_CDATASection.hpp
+++ b/src/xercesc/dom/deprecated/DOM_CDATASection.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOM_Text.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CDATASectionImpl;
/**
@@ -141,6 +144,9 @@ protected:
friend class DOM_Document;
};
+
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_CharacterData.cpp b/src/xercesc/dom/deprecated/DOM_CharacterData.cpp
index 5cda6594206c969d2f57c33142d5e66a6613d848..26229d6952949e59cb5f3310e1bcc5532199f238 100644
--- a/src/xercesc/dom/deprecated/DOM_CharacterData.cpp
+++ b/src/xercesc/dom/deprecated/DOM_CharacterData.cpp
@@ -61,6 +61,8 @@
#include "DOM_CharacterData.hpp"
#include "CharacterDataImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
DOM_CharacterData::DOM_CharacterData()
: DOM_Node(null)
@@ -145,3 +147,5 @@ void DOM_CharacterData::replaceData(unsigned int offset, unsigned int count, con
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_CharacterData.hpp b/src/xercesc/dom/deprecated/DOM_CharacterData.hpp
index 73baf7db45ab22c2c745df40574da22fcc1713e0..4a3ea007de8169c47ee8e48936e0afbc65034c5a 100644
--- a/src/xercesc/dom/deprecated/DOM_CharacterData.hpp
+++ b/src/xercesc/dom/deprecated/DOM_CharacterData.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOM_Node.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CharacterDataImpl;
/**
@@ -255,6 +258,8 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_Comment.cpp b/src/xercesc/dom/deprecated/DOM_Comment.cpp
index a653913aa16f74ea0015aeea37c0d74c4e21b6f6..331c058055711d64de4e732f62649cf95ae3cb18 100644
--- a/src/xercesc/dom/deprecated/DOM_Comment.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Comment.cpp
@@ -61,6 +61,8 @@
#include "DOM_Comment.hpp"
#include "CommentImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
DOM_Comment::DOM_Comment()
: DOM_CharacterData(null)
@@ -96,3 +98,5 @@ DOM_Comment & DOM_Comment::operator = (const DOM_NullPtr *other)
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_Comment.hpp b/src/xercesc/dom/deprecated/DOM_Comment.hpp
index 5c14ea34b646f7efe49714f3fe6c0864664eff5d..6abe510db15669d9910c061a271e8e8320f11c41 100644
--- a/src/xercesc/dom/deprecated/DOM_Comment.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Comment.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOM_CharacterData.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CommentImpl;
/**
@@ -141,5 +144,7 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_DOMException.cpp b/src/xercesc/dom/deprecated/DOM_DOMException.cpp
index a044802ecdbad44ae19db5ad8744900c9fb77d07..aad35688ea073b5a142f117c5a0766d7938c760f 100644
--- a/src/xercesc/dom/deprecated/DOM_DOMException.cpp
+++ b/src/xercesc/dom/deprecated/DOM_DOMException.cpp
@@ -61,6 +61,8 @@
#include "DOM_DOMException.hpp"
#include "DOMString.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
DOM_DOMException::DOM_DOMException()
: msg(0)
@@ -86,3 +88,6 @@ DOM_DOMException::DOM_DOMException(const DOM_DOMException &other)
DOM_DOMException::~DOM_DOMException()
{
};
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_DOMException.hpp b/src/xercesc/dom/deprecated/DOM_DOMException.hpp
index 80a56f4e1e131b1f57b79550d15a25821b0c5385..e00b224b65059c098cc99cb0f64fe1e3a45b7762 100644
--- a/src/xercesc/dom/deprecated/DOM_DOMException.hpp
+++ b/src/xercesc/dom/deprecated/DOM_DOMException.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOMString.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
/**
* Encapsulate a general DOM error or warning.
*
@@ -159,5 +162,7 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_DOMImplementation.cpp b/src/xercesc/dom/deprecated/DOM_DOMImplementation.cpp
index 471a8559fb98b4e85e0e5164a9ff8c2f31986245..b8d82b1750c1772902f6b2582f301082bacc6baf 100644
--- a/src/xercesc/dom/deprecated/DOM_DOMImplementation.cpp
+++ b/src/xercesc/dom/deprecated/DOM_DOMImplementation.cpp
@@ -68,6 +68,9 @@
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/XMLRegisterCleanup.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
//
// Static constants. These are lazily initialized on first usage.
// (Static constructors can not be safely used because
@@ -243,3 +246,6 @@ void DOM_DOMImplementation::reinitDOM_DOMImplementation() {
gCore = 0;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_DOMImplementation.hpp b/src/xercesc/dom/deprecated/DOM_DOMImplementation.hpp
index 75ae59b788069f366e29748907fce4cacc8f011b..57db8484f3c476620e44cef8ebdbd745eeac91aa 100644
--- a/src/xercesc/dom/deprecated/DOM_DOMImplementation.hpp
+++ b/src/xercesc/dom/deprecated/DOM_DOMImplementation.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOMString.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOM_Document;
class DOM_DocumentType;
@@ -195,4 +198,6 @@ class CDOM_EXPORT DOM_DOMImplementation {
static void reinitDOM_DOMImplementation();
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_Document.cpp b/src/xercesc/dom/deprecated/DOM_Document.cpp
index 70817f19d4edc4cb729adc9d42dc8f4d2c311117..f6daaaa47ad17817de128a2664b33117b2241e42 100644
--- a/src/xercesc/dom/deprecated/DOM_Document.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Document.cpp
@@ -65,6 +65,7 @@
#include "NodeIteratorImpl.hpp"
#include "TreeWalkerImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
DOM_Document::DOM_Document (DocumentImpl *impl) :
@@ -260,3 +261,6 @@ void DOM_Document::setErrorChecking(bool check) {
bool DOM_Document::getErrorChecking() {
return ((DocumentImpl *)fImpl)->getErrorChecking();
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_Document.hpp b/src/xercesc/dom/deprecated/DOM_Document.hpp
index ea01a53bf8f9c398bd9a07bd01ff047196dfd901..dd007970e69c8667c5a8fe5d8aafed9c7dee2a73 100644
--- a/src/xercesc/dom/deprecated/DOM_Document.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Document.hpp
@@ -81,6 +81,9 @@
#include "DOM_XMLDecl.hpp"
#include "DOM_Range.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DocumentImpl;
class NodeIteratorImpl;
@@ -610,4 +613,6 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_DocumentFragment.cpp b/src/xercesc/dom/deprecated/DOM_DocumentFragment.cpp
index bcd42490a0c879a99cdbb925493d9bed5bcc2459..0810ebfcefcf074d0bba8e37ae58ea6a5199f872 100644
--- a/src/xercesc/dom/deprecated/DOM_DocumentFragment.cpp
+++ b/src/xercesc/dom/deprecated/DOM_DocumentFragment.cpp
@@ -61,6 +61,7 @@
#include "DOM_DocumentFragment.hpp"
#include "DocumentFragmentImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
DOM_DocumentFragment::DOM_DocumentFragment()
@@ -98,3 +99,5 @@ DOM_DocumentFragment & DOM_DocumentFragment::operator = (const DOM_NullPtr *othe
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_DocumentFragment.hpp b/src/xercesc/dom/deprecated/DOM_DocumentFragment.hpp
index 8b1df0e6db82af42ecf5faa4b12faddec2450279..b96f8396dffc98a1a19ef0c7619294e5b6191ab9 100644
--- a/src/xercesc/dom/deprecated/DOM_DocumentFragment.hpp
+++ b/src/xercesc/dom/deprecated/DOM_DocumentFragment.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOM_Node.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DocumentFragmentImpl;
/**
@@ -173,4 +176,6 @@ protected:
friend class RangeImpl;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_DocumentType.cpp b/src/xercesc/dom/deprecated/DOM_DocumentType.cpp
index 49e7507c343963815a1efaf951da8ff4b1e5ad70..c594de492d7b023f4b66213c276b67a8fbe7e79f 100644
--- a/src/xercesc/dom/deprecated/DOM_DocumentType.cpp
+++ b/src/xercesc/dom/deprecated/DOM_DocumentType.cpp
@@ -63,6 +63,7 @@
#include "DOM_NamedNodeMap.hpp"
#include <assert.h>
+XERCES_CPP_NAMESPACE_BEGIN
DOM_DocumentType::DOM_DocumentType()
@@ -147,3 +148,6 @@ DOMString DOM_DocumentType::getInternalSubset() const
{
return ((DocumentTypeImpl *)fImpl)->getInternalSubset().clone();
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_DocumentType.hpp b/src/xercesc/dom/deprecated/DOM_DocumentType.hpp
index a295937a0ad72f955b123df3565fcf2bdc22ee9b..73502e445a9c095cde03a1dc938372921e89aa21 100644
--- a/src/xercesc/dom/deprecated/DOM_DocumentType.hpp
+++ b/src/xercesc/dom/deprecated/DOM_DocumentType.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOM_Node.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOM_NamedNodeMap;
class DocumentTypeImpl;
@@ -205,6 +208,8 @@ protected:
friend class DOM_DOMImplementation;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_Element.cpp b/src/xercesc/dom/deprecated/DOM_Element.cpp
index c30f95565ce3bd29f0fc576dc55a101c73ecb36c..9baeb2ca7f728682dbef131ef1cdb2885cc53c16 100644
--- a/src/xercesc/dom/deprecated/DOM_Element.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Element.cpp
@@ -64,6 +64,8 @@
#include "ElementImpl.hpp"
#include "DeepNodeListImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
DOM_Element::DOM_Element()
: DOM_Node(null)
@@ -216,3 +218,5 @@ bool DOM_Element::hasAttributeNS(const DOMString &namespaceURI,
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_Element.hpp b/src/xercesc/dom/deprecated/DOM_Element.hpp
index a6a19b8607c4c1e52f65b7e594ca481a421624a4..85699083c2915854a2cca86c4813472f85d73154 100644
--- a/src/xercesc/dom/deprecated/DOM_Element.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Element.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOM_Node.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOM_Attr;
class DOM_NodeList;
class ElementImpl;
@@ -443,6 +446,8 @@ public:
friend class TraverseSchema;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_Entity.cpp b/src/xercesc/dom/deprecated/DOM_Entity.cpp
index b03bc15aafa10a95b55d347ca5f0836e7f5d298b..aae909be6d6fbb6da1d976cd8937160575f2351f 100644
--- a/src/xercesc/dom/deprecated/DOM_Entity.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Entity.cpp
@@ -62,6 +62,7 @@
#include "EntityImpl.hpp"
#include "DOM_NodeList.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
DOM_Entity::DOM_Entity()
@@ -145,3 +146,6 @@ DOM_Node DOM_Entity::getNextSibling() const
{
return DOM_Node(((EntityImpl*)fImpl)->getNextSibling());
};
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_Entity.hpp b/src/xercesc/dom/deprecated/DOM_Entity.hpp
index 33b5e79f9f9ba00b4ceb9c5cc8c781e8b811d29b..9b8fdcfc84002ac5c7be60020218eed9aad02d7b 100644
--- a/src/xercesc/dom/deprecated/DOM_Entity.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Entity.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOM_Node.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class EntityImpl;
/**
@@ -169,5 +172,7 @@ protected:
friend class DOM_Document;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_EntityReference.cpp b/src/xercesc/dom/deprecated/DOM_EntityReference.cpp
index f55e39b747ef6a3e9b6942adba12bdad15c2e63d..a02f22251bae9ede8c43779c5fdd2993d8e5f58d 100644
--- a/src/xercesc/dom/deprecated/DOM_EntityReference.cpp
+++ b/src/xercesc/dom/deprecated/DOM_EntityReference.cpp
@@ -61,6 +61,8 @@
#include "DOM_EntityReference.hpp"
#include "EntityReferenceImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
DOM_EntityReference::DOM_EntityReference()
: DOM_Node(null)
@@ -97,3 +99,5 @@ DOM_EntityReference & DOM_EntityReference::operator = (const DOM_NullPtr *other)
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_EntityReference.hpp b/src/xercesc/dom/deprecated/DOM_EntityReference.hpp
index 9a78ba18d6cf698422c5b4f529ec55ca2af63a48..ea825f6dbb18dd2271d8f89388ecc0f490de216c 100644
--- a/src/xercesc/dom/deprecated/DOM_EntityReference.hpp
+++ b/src/xercesc/dom/deprecated/DOM_EntityReference.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOM_Node.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class EntityReferenceImpl;
/**
@@ -139,6 +142,8 @@ protected:
friend class DOM_Document;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_NamedNodeMap.cpp b/src/xercesc/dom/deprecated/DOM_NamedNodeMap.cpp
index d2e230ee198e9f01bf96786e759e84d15c757274..c40ce80c0777b2f02c83e87c9d917b7f61d451b9 100644
--- a/src/xercesc/dom/deprecated/DOM_NamedNodeMap.cpp
+++ b/src/xercesc/dom/deprecated/DOM_NamedNodeMap.cpp
@@ -63,6 +63,9 @@
#include "NamedNodeMapImpl.hpp"
#include "ElementImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
const unsigned short DOM_NamedNodeMap::NNM_ELEMENT = 0;
const unsigned short DOM_NamedNodeMap::NNM_OTHER = 1;
@@ -212,3 +215,6 @@ DOM_Node DOM_NamedNodeMap::removeNamedItemNS(const DOMString &namespaceURI,
return (flagElem == NNM_OTHER) ? DOM_Node(((NamedNodeMapImpl *)fImpl)->removeNamedItemNS(namespaceURI, localName)) :
DOM_Node(((ElementImpl *)fImpl)->NNM_removeNamedItemNS(namespaceURI, localName));
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_NamedNodeMap.hpp b/src/xercesc/dom/deprecated/DOM_NamedNodeMap.hpp
index 02bf3758eb9ea62f4eda37779a070edc8dbcb337..1061016d964ccfd6f3765f9a478885a1302ce1b0 100644
--- a/src/xercesc/dom/deprecated/DOM_NamedNodeMap.hpp
+++ b/src/xercesc/dom/deprecated/DOM_NamedNodeMap.hpp
@@ -64,6 +64,10 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOM_Node.hpp"
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class NamedNodeMapImpl;
/**
@@ -345,5 +349,7 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_Node.cpp b/src/xercesc/dom/deprecated/DOM_Node.cpp
index 4976e6f1d6cf13ac875c5b90c013ef916e9e5b9a..9832b9316d01272df172c5293b0da9b404e46c84 100644
--- a/src/xercesc/dom/deprecated/DOM_Node.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Node.cpp
@@ -66,6 +66,9 @@
#include "NodeImpl.hpp"
#include <assert.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
DOM_Node::DOM_Node()
{
fImpl = null;
@@ -306,3 +309,5 @@ bool DOM_Node::hasAttributes() const
return fImpl->hasAttributes();
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_Node.hpp b/src/xercesc/dom/deprecated/DOM_Node.hpp
index cc01cc424f4091057c32c0016d6db397b7b53173..4e21e410bc7fe4783b86a30159073be54e3bbf61 100644
--- a/src/xercesc/dom/deprecated/DOM_Node.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Node.hpp
@@ -64,6 +64,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOMString.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
class DOM_NodeList;
class DOM_NamedNodeMap;
class DOM_Document;
@@ -625,6 +627,7 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_NodeFilter.cpp b/src/xercesc/dom/deprecated/DOM_NodeFilter.cpp
index adbee25095028e78da17ff7b928c312983acfc99..d674a15fc3c2430fad645ecb2591158f74105046 100644
--- a/src/xercesc/dom/deprecated/DOM_NodeFilter.cpp
+++ b/src/xercesc/dom/deprecated/DOM_NodeFilter.cpp
@@ -64,6 +64,8 @@
#include "DOM_NodeFilter.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
DOM_NodeFilter::DOM_NodeFilter() {
@@ -74,4 +76,6 @@ DOM_NodeFilter::~DOM_NodeFilter() {
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_NodeFilter.hpp b/src/xercesc/dom/deprecated/DOM_NodeFilter.hpp
index 48112fdf1dd042cd96f760ecbf0486afb729c077..ca71f4bb41b8fb8747efe416d50ef68d7b2e9086 100644
--- a/src/xercesc/dom/deprecated/DOM_NodeFilter.hpp
+++ b/src/xercesc/dom/deprecated/DOM_NodeFilter.hpp
@@ -67,6 +67,9 @@
#include "DOM_Node.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class NodeFilterImpl;
@@ -174,4 +177,6 @@ class CDOM_EXPORT DOM_NodeFilter
bool operator != (const DOM_NodeFilter &other) const;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_NodeIterator.cpp b/src/xercesc/dom/deprecated/DOM_NodeIterator.cpp
index 6562a0c9e24cfdd3eaa7e6d85fe26e0fc92d8d92..cf87ada293975c874fbfee5082e04930e8047e93 100644
--- a/src/xercesc/dom/deprecated/DOM_NodeIterator.cpp
+++ b/src/xercesc/dom/deprecated/DOM_NodeIterator.cpp
@@ -62,6 +62,7 @@
#include "NodeIteratorImpl.hpp"
#include "RefCountedImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
@@ -179,3 +180,6 @@ DOM_Node DOM_NodeIterator::nextNode() {
DOM_Node DOM_NodeIterator::previousNode() {
return fImpl->previousNode();
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_NodeIterator.hpp b/src/xercesc/dom/deprecated/DOM_NodeIterator.hpp
index 45791b09456125974aab869971b98634757fb464..fb8f2b270e2b7a400deced2f12f113c27df2ced4 100644
--- a/src/xercesc/dom/deprecated/DOM_NodeIterator.hpp
+++ b/src/xercesc/dom/deprecated/DOM_NodeIterator.hpp
@@ -64,6 +64,9 @@
#include "DOM_NodeFilter.hpp"
#include "DOM_Node.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class NodeIteratorImpl;
/**
@@ -220,4 +223,6 @@ class CDOM_EXPORT DOM_NodeIterator
NodeIteratorImpl* fImpl;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_NodeList.cpp b/src/xercesc/dom/deprecated/DOM_NodeList.cpp
index 070eae914c9e9862da5c90f74b88c089e4c17b7a..d756752ea167ec2735cc494c79bcb6a21101378c 100644
--- a/src/xercesc/dom/deprecated/DOM_NodeList.cpp
+++ b/src/xercesc/dom/deprecated/DOM_NodeList.cpp
@@ -63,6 +63,9 @@
#include "DOM_Node.hpp"
#include <assert.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
DOM_NodeList::DOM_NodeList()
{
fImpl = 0;
@@ -146,3 +149,6 @@ unsigned int DOM_NodeList::getLength() const
{
return fImpl->getLength();
};
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_NodeList.hpp b/src/xercesc/dom/deprecated/DOM_NodeList.hpp
index d62985dffa45db36f8448644ffc44c91f0fd0bbf..c519eaaf8bb498aecce83cc962c33837bf8d722d 100644
--- a/src/xercesc/dom/deprecated/DOM_NodeList.hpp
+++ b/src/xercesc/dom/deprecated/DOM_NodeList.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOM_Node.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class NodeListImpl;
/**
@@ -217,6 +220,8 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_Notation.cpp b/src/xercesc/dom/deprecated/DOM_Notation.cpp
index 416776ba207959283f302c02ffca474907fa47dc..6acebaf6325a5e16764c0688c23d5fd51c4d5076 100644
--- a/src/xercesc/dom/deprecated/DOM_Notation.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Notation.cpp
@@ -61,6 +61,8 @@
#include "DOM_Notation.hpp"
#include "NotationImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
DOM_Notation::DOM_Notation()
: DOM_Node(null)
@@ -108,3 +110,6 @@ DOMString DOM_Notation::getSystemId() const
{
return ((NotationImpl *)fImpl)->getSystemId();
};
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_Notation.hpp b/src/xercesc/dom/deprecated/DOM_Notation.hpp
index 3cb09a458e871ae8a04f89b8a583ec18bd042af2..68c15bef5d03285f59095d598ab52df2920ce94c 100644
--- a/src/xercesc/dom/deprecated/DOM_Notation.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Notation.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOM_Node.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class NotationImpl;
/**
@@ -167,6 +170,8 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_ProcessingInstruction.cpp b/src/xercesc/dom/deprecated/DOM_ProcessingInstruction.cpp
index 57a20af7cf9a34e9a95f86454037ea46a40dd155..3e9527bc1a34d291c2d95f042dcc35dd88f66cd6 100644
--- a/src/xercesc/dom/deprecated/DOM_ProcessingInstruction.cpp
+++ b/src/xercesc/dom/deprecated/DOM_ProcessingInstruction.cpp
@@ -61,7 +61,7 @@
#include "DOM_ProcessingInstruction.hpp"
#include "ProcessingInstructionImpl.hpp"
-
+XERCES_CPP_NAMESPACE_BEGIN
DOM_ProcessingInstruction::DOM_ProcessingInstruction()
@@ -121,3 +121,5 @@ void DOM_ProcessingInstruction::setData(const DOMString &data)
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_ProcessingInstruction.hpp b/src/xercesc/dom/deprecated/DOM_ProcessingInstruction.hpp
index d9ab1fa21871a06a5c9b582c45015e3924d9ec33..4c0fa27549d8b625d210ffcfbd6f4414dbd2abe7 100644
--- a/src/xercesc/dom/deprecated/DOM_ProcessingInstruction.hpp
+++ b/src/xercesc/dom/deprecated/DOM_ProcessingInstruction.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOM_Node.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class ProcessingInstructionImpl;
/**
@@ -172,5 +175,7 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_Range.cpp b/src/xercesc/dom/deprecated/DOM_Range.cpp
index 0ea8e5ba7649fa1576fcd72ad3d441ca1a2dda1e..c0570f5d039fb4279f4ee2c48b52d187d42bfb5b 100644
--- a/src/xercesc/dom/deprecated/DOM_Range.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Range.cpp
@@ -64,6 +64,7 @@
#include "DocumentImpl.hpp"
#include "RangeImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
DOM_Range::DOM_Range()
@@ -153,7 +154,7 @@ const DOM_Node DOM_Range::getCommonAncestorContainer() const
return ((RangeImpl *)fImpl)->getCommonAncestorContainer();
}
-//setter functions
+//setter functions
void DOM_Range::setStart(const DOM_Node& parent, unsigned int offset)
{
@@ -198,11 +199,11 @@ bool DOM_Range::getCollapsed() const
void DOM_Range::selectNode(const DOM_Node& node)
{
- ((RangeImpl *)fImpl)->selectNode(node);
+ ((RangeImpl *)fImpl)->selectNode(node);
}
void DOM_Range::selectNodeContents(const DOM_Node& node)
{
- ((RangeImpl *)fImpl)->selectNodeContents(node);
+ ((RangeImpl *)fImpl)->selectNodeContents(node);
}
//Functions related to comparing ange Boundrary-Points
@@ -252,3 +253,5 @@ void DOM_Range::detach()
((RangeImpl *)fImpl)->detach();
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_Range.hpp b/src/xercesc/dom/deprecated/DOM_Range.hpp
index 2f4eb93903254759a39248f1c728c5e3db10f818..b04c8f5af3e3f5a768a6c3d5952b338aa324b968 100644
--- a/src/xercesc/dom/deprecated/DOM_Range.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Range.hpp
@@ -66,6 +66,9 @@
#include "DOMString.hpp"
#include "DOM_DocumentFragment.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class RangeImpl;
//class RangeImpl;
@@ -141,4 +144,6 @@ protected:
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_RangeException.cpp b/src/xercesc/dom/deprecated/DOM_RangeException.cpp
index f462bcf8d98910d4385a4932ffb834a6b53a699f..df65bd02298d89ffa8d3b205405c47479cca273b 100644
--- a/src/xercesc/dom/deprecated/DOM_RangeException.cpp
+++ b/src/xercesc/dom/deprecated/DOM_RangeException.cpp
@@ -60,6 +60,9 @@
#include "DOM_RangeException.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
DOM_RangeException::DOM_RangeException()
: DOM_DOMException()
@@ -85,3 +88,6 @@ DOM_RangeException::DOM_RangeException(const DOM_RangeException &other)
DOM_RangeException::~DOM_RangeException()
{
};
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_RangeException.hpp b/src/xercesc/dom/deprecated/DOM_RangeException.hpp
index b7c5c1108816e557fc5e8dc015a0c2d58130a29e..bf77592fd79078d8db82d4aa4b80e55773243596 100644
--- a/src/xercesc/dom/deprecated/DOM_RangeException.hpp
+++ b/src/xercesc/dom/deprecated/DOM_RangeException.hpp
@@ -63,6 +63,9 @@
#include "DOM_DOMException.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
/**
* Encapsulate range related DOM error or warning. DOM level 2 implementation.
*
@@ -135,5 +138,7 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_Text.cpp b/src/xercesc/dom/deprecated/DOM_Text.cpp
index 75d2eb5cbeade80e863cc63985653b009405bcf0..424c955ab87c5c1faa0e93cb3813bf1795cc20ff 100644
--- a/src/xercesc/dom/deprecated/DOM_Text.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Text.cpp
@@ -61,6 +61,7 @@
#include "DOM_Text.hpp"
#include "TextImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
DOM_Text::DOM_Text()
@@ -108,3 +109,6 @@ bool DOM_Text::isIgnorableWhitespace()
{
return ((TextImpl *)fImpl)->isIgnorableWhitespace();
};
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_Text.hpp b/src/xercesc/dom/deprecated/DOM_Text.hpp
index 362118c7d8f1d7db18d5a4649c189c3782d65c60..42651a8dbc964cc054ed04813d0b0e289cccf6b4 100644
--- a/src/xercesc/dom/deprecated/DOM_Text.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Text.hpp
@@ -64,6 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOM_CharacterData.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class TextImpl;
@@ -189,6 +192,8 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_TreeWalker.cpp b/src/xercesc/dom/deprecated/DOM_TreeWalker.cpp
index a762b087f76653486ffdaf006e9d6c19a7bf0732..65bb8852831d52128c628eef9936ee6d52ba81e2 100644
--- a/src/xercesc/dom/deprecated/DOM_TreeWalker.cpp
+++ b/src/xercesc/dom/deprecated/DOM_TreeWalker.cpp
@@ -62,8 +62,7 @@
#include "RefCountedImpl.hpp"
#include "TreeWalkerImpl.hpp"
-
-
+XERCES_CPP_NAMESPACE_BEGIN
DOM_TreeWalker::DOM_TreeWalker()
@@ -200,4 +199,6 @@ DOM_Node DOM_TreeWalker::nextNode() {
return fImpl->nextNode();
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_TreeWalker.hpp b/src/xercesc/dom/deprecated/DOM_TreeWalker.hpp
index 677428a4260254c70e603ef75b7dc65ed2d4ab83..c1faa64bcc741060ae8960056a4b283683fba75f 100644
--- a/src/xercesc/dom/deprecated/DOM_TreeWalker.hpp
+++ b/src/xercesc/dom/deprecated/DOM_TreeWalker.hpp
@@ -64,6 +64,9 @@
#include "DOM_Node.hpp"
#include "DOM_NodeFilter.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class TreeWalkerImpl;
@@ -269,4 +272,6 @@ class CDOM_EXPORT DOM_TreeWalker {
TreeWalkerImpl* fImpl;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DOM_XMLDecl.cpp b/src/xercesc/dom/deprecated/DOM_XMLDecl.cpp
index f10b995dd82cb4f19e2c13c2bde5b711500cb2a7..76fa9724d54b689551853f6b8fbb6adbe96bf619 100644
--- a/src/xercesc/dom/deprecated/DOM_XMLDecl.cpp
+++ b/src/xercesc/dom/deprecated/DOM_XMLDecl.cpp
@@ -62,6 +62,7 @@
#include "DOM_XMLDecl.hpp"
#include "XMLDeclImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
DOM_XMLDecl::DOM_XMLDecl() :
@@ -110,3 +111,5 @@ DOMString DOM_XMLDecl::getStandalone() const
return DOMString( ((XMLDeclImpl*)fImpl)->getStandalone());
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DOM_XMLDecl.hpp b/src/xercesc/dom/deprecated/DOM_XMLDecl.hpp
index dc44295dc365dc21ff1ad77775a07c6b9540fa0f..20ea41427fb9abd3c88661a846c1e179e6e8e65f 100644
--- a/src/xercesc/dom/deprecated/DOM_XMLDecl.hpp
+++ b/src/xercesc/dom/deprecated/DOM_XMLDecl.hpp
@@ -65,6 +65,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOM_Node.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class XMLDeclImpl;
/**
* Class to refer to XML Declaration nodes in the DOM.
@@ -161,4 +164,6 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DStringPool.cpp b/src/xercesc/dom/deprecated/DStringPool.cpp
index 494996b318b2fff0d79be46cb24b818277e25d08..9ec203a6045821a6f73fef82ee44947cc825d05b 100644
--- a/src/xercesc/dom/deprecated/DStringPool.cpp
+++ b/src/xercesc/dom/deprecated/DStringPool.cpp
@@ -67,6 +67,9 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/PlatformUtils.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
//
// DStringPoolEntry - one of these structs is allocated for each
// DOMString in the pool. Each slot in the
@@ -190,3 +193,6 @@ const DOMString &DStringPool::getStaticString(const char *in
}
return **loc;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DStringPool.hpp b/src/xercesc/dom/deprecated/DStringPool.hpp
index 88c724c65d6808049c38c5782757c63fba041fc9..618c0e506813f38897e8b79741780c32b463f9f5 100644
--- a/src/xercesc/dom/deprecated/DStringPool.hpp
+++ b/src/xercesc/dom/deprecated/DStringPool.hpp
@@ -75,6 +75,9 @@
#include "DOMString.hpp"
#include <xercesc/util/XMLRegisterCleanup.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
struct DStringPoolEntry;
//
@@ -107,4 +110,6 @@ private:
int fHashTableSize;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DeepNodeListImpl.cpp b/src/xercesc/dom/deprecated/DeepNodeListImpl.cpp
index e6bee46a59ee5c2c7e90492c3912d3831eac8dd3..bef4f5e94a4394f6313960ec95259525b45e7f46 100644
--- a/src/xercesc/dom/deprecated/DeepNodeListImpl.cpp
+++ b/src/xercesc/dom/deprecated/DeepNodeListImpl.cpp
@@ -65,6 +65,9 @@
#include "DStringPool.hpp"
#include <limits.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
static DOMString *kAstr = 0;
static XMLRegisterCleanup kAstrCleanup;
@@ -240,3 +243,6 @@ void DeepNodeListImpl::reinitDeepNodeListImpl() {
delete kAstr;
kAstr = 0;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DeepNodeListImpl.hpp b/src/xercesc/dom/deprecated/DeepNodeListImpl.hpp
index 71beb4aa910ea2d798c48adbd1076090dda98d7d..6fee9472deaca2c64e05dc662a4e279b2ae657df 100644
--- a/src/xercesc/dom/deprecated/DeepNodeListImpl.hpp
+++ b/src/xercesc/dom/deprecated/DeepNodeListImpl.hpp
@@ -75,6 +75,9 @@
#include "DOMString.hpp"
#include "NodeImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class NodeImpl;
class NodeVector;
@@ -110,4 +113,6 @@ private:
virtual void unreferenced();
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DocumentFragmentImpl.cpp b/src/xercesc/dom/deprecated/DocumentFragmentImpl.cpp
index d546b5ccb620b40d0702f482ea1c11867594ce20..d4452c242d5e7d9d9c6ce6ed9508e39f05e26c64 100644
--- a/src/xercesc/dom/deprecated/DocumentFragmentImpl.cpp
+++ b/src/xercesc/dom/deprecated/DocumentFragmentImpl.cpp
@@ -63,6 +63,9 @@
#include "DOM_DOMException.hpp"
#include "DStringPool.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
static DOMString *nam = 0; // Will be lazily initialized to "#document-fragment"
static XMLRegisterCleanup namCleanup;
@@ -120,3 +123,6 @@ void DocumentFragmentImpl::reinitDocumentFragmentImpl() {
delete nam;
nam = 0;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DocumentFragmentImpl.hpp b/src/xercesc/dom/deprecated/DocumentFragmentImpl.hpp
index 2860983693c5faaeecd321f6dbcfcc37786a93b9..39d64f76880d7a2ca06a55b30692001016e300e3 100644
--- a/src/xercesc/dom/deprecated/DocumentFragmentImpl.hpp
+++ b/src/xercesc/dom/deprecated/DocumentFragmentImpl.hpp
@@ -72,6 +72,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "ParentNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CDOM_EXPORT DocumentFragmentImpl: public ParentNode {
protected:
DocumentFragmentImpl(DocumentImpl *);
@@ -93,5 +96,7 @@ public:
static void reinitDocumentFragmentImpl();
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DocumentImpl.cpp b/src/xercesc/dom/deprecated/DocumentImpl.cpp
index 19463deacf61ca3d7d7690240532120f9be3bd3c..6d1a061ca0ac50c0ef5954d477362f0c277f10fd 100644
--- a/src/xercesc/dom/deprecated/DocumentImpl.cpp
+++ b/src/xercesc/dom/deprecated/DocumentImpl.cpp
@@ -92,6 +92,9 @@
#include "RangeImpl.hpp"
#include "DOM_Document.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
static DOMString *nam = 0; // will be lazily initialized to "#document"
static XMLRegisterCleanup namCleanup;
@@ -874,3 +877,6 @@ void DocumentImpl::reinitDocumentImpl() {
delete nam;
nam = 0;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DocumentImpl.hpp b/src/xercesc/dom/deprecated/DocumentImpl.hpp
index 7b5f6a0ade3fdf745ad3e64bbfe70755490692ef..000dd221202b98f5e2cfe84c0691a2e34900e864 100644
--- a/src/xercesc/dom/deprecated/DocumentImpl.hpp
+++ b/src/xercesc/dom/deprecated/DocumentImpl.hpp
@@ -78,6 +78,9 @@
#include "xercesc/util/RefHashTableOf.hpp"
#include "XMLDeclImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DocumentTypeImpl;
class ElementImpl;
class AttrImpl;
@@ -272,4 +275,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DocumentTypeImpl.cpp b/src/xercesc/dom/deprecated/DocumentTypeImpl.cpp
index 69554f87cda25d2334e58ebf69a6c04bd0b42980..d9f8152ced2027394c2304692667454bce53d806 100644
--- a/src/xercesc/dom/deprecated/DocumentTypeImpl.cpp
+++ b/src/xercesc/dom/deprecated/DocumentTypeImpl.cpp
@@ -64,6 +64,8 @@
#include "DOM_DOMException.hpp"
#include "DocumentImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
DocumentTypeImpl::DocumentTypeImpl(DocumentImpl *ownerDoc,
const DOMString &dtName)
@@ -247,3 +249,6 @@ void DocumentTypeImpl::setInternalSubset(const DOMString &value)
return;
internalSubset = value.clone();
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DocumentTypeImpl.hpp b/src/xercesc/dom/deprecated/DocumentTypeImpl.hpp
index e61d2d09a66345e6a24242a6ac4b769bcb8d7cbd..febceb0696be93382dc45536b9b8198c3c60dde6 100644
--- a/src/xercesc/dom/deprecated/DocumentTypeImpl.hpp
+++ b/src/xercesc/dom/deprecated/DocumentTypeImpl.hpp
@@ -75,6 +75,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "ParentNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class NamedNodeMapImpl;
class CDOM_EXPORT DocumentTypeImpl: public ParentNode {
@@ -122,4 +125,6 @@ public:
virtual DOMString getInternalSubset();
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/DomMemDebug.cpp b/src/xercesc/dom/deprecated/DomMemDebug.cpp
index ef033186c407884b4b90cc86eeb2603fb9253d6a..f2ac77931bf9bc5fc1725f4ae0d4991cdf53441e 100644
--- a/src/xercesc/dom/deprecated/DomMemDebug.cpp
+++ b/src/xercesc/dom/deprecated/DomMemDebug.cpp
@@ -65,6 +65,8 @@
#include "NamedNodeMapImpl.hpp"
#include <stdio.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
DomMemDebug::DomMemDebug()
{
@@ -157,3 +159,6 @@ void DomMemDebug::printDifference(const DomMemDebug &other)
printf("\n");
};
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/DomMemDebug.hpp b/src/xercesc/dom/deprecated/DomMemDebug.hpp
index aec38bb7ef368d5fb082936a0d5d63d77efcfa31..89ca967a585e5af0042faae2f093d9b6a40f7177 100644
--- a/src/xercesc/dom/deprecated/DomMemDebug.hpp
+++ b/src/xercesc/dom/deprecated/DomMemDebug.hpp
@@ -63,6 +63,9 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
//
// This class aids in debugging memory management problems with the
// reference counted DOM classes - DOMStrings, Nodes (including subclasses),
@@ -100,4 +103,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/ElementDefinitionImpl.cpp b/src/xercesc/dom/deprecated/ElementDefinitionImpl.cpp
index 0f3b7db686d791a03ed1bb66a0502c2f6eef3d2f..ed6cb605e03e8dcc31b58e797e11bcff1a163851 100644
--- a/src/xercesc/dom/deprecated/ElementDefinitionImpl.cpp
+++ b/src/xercesc/dom/deprecated/ElementDefinitionImpl.cpp
@@ -62,6 +62,9 @@
#include "NamedNodeMapImpl.hpp"
#include "NodeImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
ElementDefinitionImpl::ElementDefinitionImpl(DocumentImpl *ownerDoc,
const DOMString &nam)
@@ -111,4 +114,6 @@ NamedNodeMapImpl *ElementDefinitionImpl::getAttributes() {
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/ElementDefinitionImpl.hpp b/src/xercesc/dom/deprecated/ElementDefinitionImpl.hpp
index fa6da86cd78842924946b7acbdc4cbbbc2f4f6dd..3179b9364e9b2f752323a1e1c71229d4e2738058 100644
--- a/src/xercesc/dom/deprecated/ElementDefinitionImpl.hpp
+++ b/src/xercesc/dom/deprecated/ElementDefinitionImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -48,7 +48,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -73,15 +73,18 @@
#include "NodeImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CDOM_EXPORT ElementDefinitionImpl: public NodeImpl {
private:
DOMString name;
NamedNodeMapImpl *attributes;
-
+
public:
ElementDefinitionImpl(DocumentImpl *ownerDocument, const DOMString &name);
ElementDefinitionImpl(const ElementDefinitionImpl& other, bool deep=false);
-
+
virtual ~ElementDefinitionImpl();
virtual NodeImpl *cloneNode(bool deep);
virtual DOMString getNodeName();
@@ -89,4 +92,6 @@ public:
virtual NamedNodeMapImpl *getAttributes();
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/ElementImpl.cpp b/src/xercesc/dom/deprecated/ElementImpl.cpp
index 0c9fec88e1c6829c224ae874d6db278546936b94..b76765fa9ba43a0440b2c6369da4d8d4488f1acb 100644
--- a/src/xercesc/dom/deprecated/ElementImpl.cpp
+++ b/src/xercesc/dom/deprecated/ElementImpl.cpp
@@ -68,6 +68,8 @@
#include "NamedNodeMapImpl.hpp"
#include "NodeVector.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
static DOMString *gEmptyString = 0;
static XMLRegisterCleanup emptyStringCleanup;
@@ -532,3 +534,6 @@ void ElementImpl::reinitElementImpl() {
gEmptyString = 0;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/ElementImpl.hpp b/src/xercesc/dom/deprecated/ElementImpl.hpp
index c6b1f41d8c1bec9abdf98088264b9468e238a066..32d966580173dfce926a3ff94bf4273dcc3b3bf3 100644
--- a/src/xercesc/dom/deprecated/ElementImpl.hpp
+++ b/src/xercesc/dom/deprecated/ElementImpl.hpp
@@ -76,6 +76,9 @@
#include "AttrMapImpl.hpp"
#include "ParentNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DeepNodeListImpl;
class CDOM_EXPORT ElementImpl: public ParentNode {
@@ -149,4 +152,6 @@ public:
static void reinitElementImpl();
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/ElementNSImpl.cpp b/src/xercesc/dom/deprecated/ElementNSImpl.cpp
index 4f36fb33ec083185751bf20a9a05fce60c3838ab..984ecfd66b1e8b9db6438e007eb7feab46f81f17 100644
--- a/src/xercesc/dom/deprecated/ElementNSImpl.cpp
+++ b/src/xercesc/dom/deprecated/ElementNSImpl.cpp
@@ -63,6 +63,9 @@
#include "DocumentImpl.hpp"
#include "DOM_DOMException.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
ElementNSImpl::ElementNSImpl(DocumentImpl *ownerDoc, const DOMString &nam) :
ElementImpl(ownerDoc, nam)
{
@@ -160,3 +163,6 @@ void ElementNSImpl::setPrefix(const DOMString &prefix)
name = prefix + chColon + localName; //nodeName is changed too
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/ElementNSImpl.hpp b/src/xercesc/dom/deprecated/ElementNSImpl.hpp
index 8845b236adaab8381e52f1ba98fcab60d6e2da49..bfd4e890e17e14be18f6b1ff33d7368e9d324c79 100644
--- a/src/xercesc/dom/deprecated/ElementNSImpl.hpp
+++ b/src/xercesc/dom/deprecated/ElementNSImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -48,7 +48,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -73,20 +73,22 @@
#include "ElementImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
class CDOM_EXPORT ElementNSImpl: public ElementImpl {
protected:
//Introduced in DOM Level 2
DOMString namespaceURI; //namespace URI of this node
DOMString localName; //local part of qualified name
-
-
+
+
public:
ElementNSImpl(DocumentImpl *ownerDoc, const DOMString &name);
ElementNSImpl(DocumentImpl *ownerDoc, //DOM Level 2
const DOMString &namespaceURI, const DOMString &qualifiedName);
ElementNSImpl(const ElementNSImpl &other, bool deep=false);
-
+
virtual NodeImpl * cloneNode(bool deep);
//Introduced in DOM Level 2
virtual DOMString getNamespaceURI();
@@ -95,4 +97,6 @@ public:
virtual void setPrefix(const DOMString &prefix);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/EntityImpl.cpp b/src/xercesc/dom/deprecated/EntityImpl.cpp
index 1457913aea94788d71b1cb3f7e40b4dfb8f1be06..d5d37f7ed39847751b0c185fbf0c45ef231dd07e 100644
--- a/src/xercesc/dom/deprecated/EntityImpl.cpp
+++ b/src/xercesc/dom/deprecated/EntityImpl.cpp
@@ -62,6 +62,8 @@
#include "DOM_Node.hpp"
#include "EntityImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
EntityImpl::EntityImpl(DocumentImpl *ownerDoc, const DOMString &eName)
: ParentNode(ownerDoc),
@@ -204,3 +206,6 @@ NodeImpl* EntityImpl::item(unsigned int index)
node = node->nextSibling;
return node;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/EntityImpl.hpp b/src/xercesc/dom/deprecated/EntityImpl.hpp
index d223a16f8b8662e5387537873628ade60409c99d..db7a1879c025ca4d45dd0d5736455a301d11af6c 100644
--- a/src/xercesc/dom/deprecated/EntityImpl.hpp
+++ b/src/xercesc/dom/deprecated/EntityImpl.hpp
@@ -74,6 +74,8 @@
#include "ParentNode.hpp"
#include "EntityReferenceImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
class CDOM_EXPORT EntityImpl: public ParentNode {
private:
@@ -113,5 +115,7 @@ public:
virtual EntityReferenceImpl* getEntityRef() const;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/EntityReferenceImpl.cpp b/src/xercesc/dom/deprecated/EntityReferenceImpl.cpp
index 7c914114023dcb2c31a1449d0fef609b475fd057..9794793c4af9ab9c4e194b6cbe7d3f2d7e2cf24a 100644
--- a/src/xercesc/dom/deprecated/EntityReferenceImpl.cpp
+++ b/src/xercesc/dom/deprecated/EntityReferenceImpl.cpp
@@ -119,6 +119,8 @@
#include "DOM_Node.hpp"
#include "NamedNodeMapImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
EntityReferenceImpl::EntityReferenceImpl(DocumentImpl *ownerDoc,
const DOMString &entityName)
@@ -201,3 +203,6 @@ void EntityReferenceImpl::setReadOnly(bool readOnl,bool deep)
throw DOM_DOMException(DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,null);
ParentNode::setReadOnly(readOnl,deep);
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/EntityReferenceImpl.hpp b/src/xercesc/dom/deprecated/EntityReferenceImpl.hpp
index 4660951fff85098b375f7ca13ba7566d00ab3d6e..4222b91b452533b9e685765f510c2f0fe3159e73 100644
--- a/src/xercesc/dom/deprecated/EntityReferenceImpl.hpp
+++ b/src/xercesc/dom/deprecated/EntityReferenceImpl.hpp
@@ -73,6 +73,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "ParentNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CDOM_EXPORT EntityReferenceImpl: public ParentNode
{
private:
@@ -89,5 +92,7 @@ public:
virtual void setReadOnly(bool readOnly,bool deep);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/MemDebug.hpp b/src/xercesc/dom/deprecated/MemDebug.hpp
index de711ec27f0120ae0c34dabcce6deadfbb376b48..16166c7f98778f84fa571a3914ea515dc28ebdce 100644
--- a/src/xercesc/dom/deprecated/MemDebug.hpp
+++ b/src/xercesc/dom/deprecated/MemDebug.hpp
@@ -61,6 +61,10 @@
* $Id$
*/
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
class DomMemDebug
{
@@ -85,4 +89,6 @@ public:
bool operator = (const DOMMemDebug &other);
};
+XERCES_CPP_NAMESPACE_END
+
#endif // MemDebug_HEADER_GUARD_
diff --git a/src/xercesc/dom/deprecated/NameNodeFilter.hpp b/src/xercesc/dom/deprecated/NameNodeFilter.hpp
index 62f94303f535247c101cb6bf6dcfcd04744f2703..95039ddd6cb7a9d30e5eb7db70e0721ba0aee350 100644
--- a/src/xercesc/dom/deprecated/NameNodeFilter.hpp
+++ b/src/xercesc/dom/deprecated/NameNodeFilter.hpp
@@ -76,6 +76,8 @@
#include "DOMString.hpp"
#include "DOM_Node.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
class CDOM_EXPORT NameNodeFilter : public NodeFilterImpl
{
@@ -105,4 +107,6 @@ class CDOM_EXPORT NameNodeFilter : public NodeFilterImpl
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/NamedNodeMapImpl.cpp b/src/xercesc/dom/deprecated/NamedNodeMapImpl.cpp
index 804131bb50ef08eb1295ddb145eae00e0db48e70..a6ec5298eac9aef4772bfd1e938b10a5403ed4a4 100644
--- a/src/xercesc/dom/deprecated/NamedNodeMapImpl.cpp
+++ b/src/xercesc/dom/deprecated/NamedNodeMapImpl.cpp
@@ -64,6 +64,8 @@
#include "DOM_DOMException.hpp"
#include "DocumentImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
int NamedNodeMapImpl::gLiveNamedNodeMaps = 0;
int NamedNodeMapImpl::gTotalNamedNodeMaps = 0;
@@ -455,3 +457,6 @@ void NamedNodeMapImpl::cloneContent(NamedNodeMapImpl *srcmap) {
}
}
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/NamedNodeMapImpl.hpp b/src/xercesc/dom/deprecated/NamedNodeMapImpl.hpp
index 05abc05ee827d337ab15b22646c6b3e5eda7254b..0a1a258dfd34ff3881c439e11d06ede387a08f9a 100644
--- a/src/xercesc/dom/deprecated/NamedNodeMapImpl.hpp
+++ b/src/xercesc/dom/deprecated/NamedNodeMapImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -48,7 +48,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -73,6 +73,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "NodeImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class NodeVector;
class DocumentImpl;
class NodeImpl;
@@ -85,18 +88,18 @@ protected:
int refCount;
static int gLiveNamedNodeMaps;
static int gTotalNamedNodeMaps;
-
-
+
+
friend class DOM_NamedNodeMap;
friend class DomMemDebug;
friend class ElementImpl;
friend class DocumentImpl;
virtual void cloneContent(NamedNodeMapImpl *srcmap);
-
+
public:
NamedNodeMapImpl(NodeImpl *ownerNode);
-
+
virtual ~NamedNodeMapImpl();
virtual NamedNodeMapImpl *cloneMap(NodeImpl *ownerNode);
static void addRef(NamedNodeMapImpl *);
@@ -122,5 +125,7 @@ public:
virtual void setOwnerDocument(DocumentImpl *doc);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/NodeIDMap.cpp b/src/xercesc/dom/deprecated/NodeIDMap.cpp
index 1d7ba020bb5c13d355576c67081d20262e76cd31..d875a07b4d5509b650b23728338a852d4c0518f0 100644
--- a/src/xercesc/dom/deprecated/NodeIDMap.cpp
+++ b/src/xercesc/dom/deprecated/NodeIDMap.cpp
@@ -61,6 +61,9 @@
#include <xercesc/util/RuntimeException.hpp>
#include <stdio.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
static const int gPrimes[] = {997, 9973, 99991, 999983, 0 }; // To do - add a few more.
static const float gMaxFill = 0.8f; // The maximum fraction of the total
@@ -269,4 +272,6 @@ void NodeIDMap::growTable()
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/NodeIDMap.hpp b/src/xercesc/dom/deprecated/NodeIDMap.hpp
index e398fb4d3eb73c1e3af79e7cd0459f8085ed5eae..e5df49ea48068cee0cf93aef1ccd16fc8a25606a 100644
--- a/src/xercesc/dom/deprecated/NodeIDMap.hpp
+++ b/src/xercesc/dom/deprecated/NodeIDMap.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -48,7 +48,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -78,6 +78,11 @@
// smaller when tuned for this exact usage, and the generic RefHashTableOf
// from the xerces utils project is not a paricularly good fit.
//
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class AttrImpl;
class DOMString;
@@ -107,7 +112,7 @@ private:
private:
AttrImpl **fTable;
unsigned int fSizeIndex; // Index of the current table size in the
- // array of possible table sizes.
+ // array of possible table sizes.
unsigned int fSize; // The current size of the table array
// (number of slots, not bytes.)
unsigned int fNumEntries; // The number of entries used.
@@ -117,4 +122,6 @@ private:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/NodeImpl.cpp b/src/xercesc/dom/deprecated/NodeImpl.cpp
index e50b2d67f193dc559457c5bff2034a437a34b0df..c20a7a9e80a6539b1c18c347db5b8d8ac7029c45 100644
--- a/src/xercesc/dom/deprecated/NodeImpl.cpp
+++ b/src/xercesc/dom/deprecated/NodeImpl.cpp
@@ -74,6 +74,9 @@
#include "stdio.h"
#include "TextImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
static DOMString *s_xml = null;
static DOMString *s_xmlURI = null;
static DOMString *s_xmlns = null;
@@ -531,3 +534,6 @@ void NodeImpl::reinitNodeImpl() {
s_xmlnsURI = 0;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/NodeImpl.hpp b/src/xercesc/dom/deprecated/NodeImpl.hpp
index a3217cc7f0305d8d8e587cbfe27a482b7741d997..4af566750863135e68445546807faecc4b2eb5fa 100644
--- a/src/xercesc/dom/deprecated/NodeImpl.hpp
+++ b/src/xercesc/dom/deprecated/NodeImpl.hpp
@@ -92,6 +92,8 @@
#include "NodeListImpl.hpp"
#include "DOMString.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
class NamedNodeMapImpl;
class NodeListImpl;
@@ -304,4 +306,6 @@ public: // should really be protected - ALH
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/NodeIteratorImpl.cpp b/src/xercesc/dom/deprecated/NodeIteratorImpl.cpp
index c6f62d94a74f11057fba0210cf6083b4b92daf3d..b69d02bf534e4d89df8ae4e7eb34ee903a5d4994 100644
--- a/src/xercesc/dom/deprecated/NodeIteratorImpl.cpp
+++ b/src/xercesc/dom/deprecated/NodeIteratorImpl.cpp
@@ -67,6 +67,9 @@
#include "DOM_DOMException.hpp"
#include "DocumentImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
@@ -426,3 +429,6 @@ void NodeIteratorImpl::unreferenced()
NodeIteratorImpl* ptr = this;
delete ptr;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/NodeIteratorImpl.hpp b/src/xercesc/dom/deprecated/NodeIteratorImpl.hpp
index acd706d647ce3be8e048422c423544dfd00d5141..f3b6b9653d9f15f992cc3a2193064cfa429f0bd2 100644
--- a/src/xercesc/dom/deprecated/NodeIteratorImpl.hpp
+++ b/src/xercesc/dom/deprecated/NodeIteratorImpl.hpp
@@ -75,6 +75,8 @@
#include "DOM_NodeIterator.hpp"
#include "RefCountedImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
class CDOM_EXPORT NodeIteratorImpl : public RefCountedImpl {
protected:
@@ -154,4 +156,6 @@ class CDOM_EXPORT NodeIteratorImpl : public RefCountedImpl {
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/NodeListImpl.cpp b/src/xercesc/dom/deprecated/NodeListImpl.cpp
index 6befc3bfbeb73eaf23257b87f8431e1ea55ad859..701df0fafebc357ee3677fb1f4889a2bbd1281f8 100644
--- a/src/xercesc/dom/deprecated/NodeListImpl.cpp
+++ b/src/xercesc/dom/deprecated/NodeListImpl.cpp
@@ -61,7 +61,12 @@
#include "NodeListImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
NodeListImpl::NodeListImpl() {};
NodeListImpl::~NodeListImpl() {};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/NodeListImpl.hpp b/src/xercesc/dom/deprecated/NodeListImpl.hpp
index 61fd051d0a2ba373b6ae9f7ed88b09b8538841f3..c4b1e1a985779268d7207a4bbcd9e4271fa6c298 100644
--- a/src/xercesc/dom/deprecated/NodeListImpl.hpp
+++ b/src/xercesc/dom/deprecated/NodeListImpl.hpp
@@ -72,6 +72,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include "RefCountedImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
class NodeImpl;
@@ -85,6 +87,8 @@ public:
virtual unsigned int getLength() = 0;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/NodeVector.cpp b/src/xercesc/dom/deprecated/NodeVector.cpp
index f7a2279572850706b38cd303748157f36d25e0e6..2de85135aafa5caf3ed6b3d942984b80c7c091a0 100644
--- a/src/xercesc/dom/deprecated/NodeVector.cpp
+++ b/src/xercesc/dom/deprecated/NodeVector.cpp
@@ -70,6 +70,9 @@
#include "NodeVector.hpp"
#include <assert.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
NodeVector::NodeVector()
{
init(10);
@@ -169,3 +172,5 @@ unsigned int NodeVector::size() {
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/NodeVector.hpp b/src/xercesc/dom/deprecated/NodeVector.hpp
index bfecf9401a9ec16d39cf59c08d7f5f11d82628f8..a93d87b08c4152fcf37b4f80e0376de8e47bc16c 100644
--- a/src/xercesc/dom/deprecated/NodeVector.hpp
+++ b/src/xercesc/dom/deprecated/NodeVector.hpp
@@ -71,6 +71,10 @@
#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class NodeImpl;
@@ -97,4 +101,6 @@ public:
void reset();
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/NotationImpl.cpp b/src/xercesc/dom/deprecated/NotationImpl.cpp
index 7109802982788bea55b9de7bef858539b98a99c2..4ae384f18f027a54b80ea400b1a5c0dc926dc85e 100644
--- a/src/xercesc/dom/deprecated/NotationImpl.cpp
+++ b/src/xercesc/dom/deprecated/NotationImpl.cpp
@@ -63,6 +63,9 @@
#include "DOM_Node.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
/**
* Notations are how the Document Type Description (DTD) records hints
* about the format of an XML "unparsed entity" -- in other words,
@@ -158,3 +161,5 @@ void NotationImpl::setSystemId(const DOMString &arg)
systemId = arg.clone();
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/NotationImpl.hpp b/src/xercesc/dom/deprecated/NotationImpl.hpp
index 07bff26ffd46d0009bf3fd072cd837c20db0539e..95ebd208a2eead7e3507e1980a9c64e85b2e64fc 100644
--- a/src/xercesc/dom/deprecated/NotationImpl.hpp
+++ b/src/xercesc/dom/deprecated/NotationImpl.hpp
@@ -72,6 +72,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "NodeImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DocumentImpl;
class CDOM_EXPORT NotationImpl: public NodeImpl {
@@ -112,4 +115,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/ParentNode.cpp b/src/xercesc/dom/deprecated/ParentNode.cpp
index ebe41400ea96955aa96107704802cba7e53aab84..9750af4cea964d422d87d10d37f25e8888db03e3 100644
--- a/src/xercesc/dom/deprecated/ParentNode.cpp
+++ b/src/xercesc/dom/deprecated/ParentNode.cpp
@@ -68,6 +68,8 @@
#include "DocumentImpl.hpp"
#include "RangeImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
ParentNode::ParentNode(DocumentImpl *ownerDoc)
: ChildNode(ownerDoc)
@@ -509,3 +511,5 @@ void ParentNode::normalize()
// so does not have to be reissued.
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/ParentNode.hpp b/src/xercesc/dom/deprecated/ParentNode.hpp
index cd686b9a3d7e3f44d26923feca45feb8a9c50801..9f5e1ebf6d4a9f03226975f1bfd336b7fff55261 100644
--- a/src/xercesc/dom/deprecated/ParentNode.hpp
+++ b/src/xercesc/dom/deprecated/ParentNode.hpp
@@ -101,6 +101,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include "ChildNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
class CDOM_EXPORT ParentNode: public ChildNode {
public:
DocumentImpl *ownerDocument; // Document this node belongs to
@@ -146,4 +148,6 @@ protected:
int fCachedChildIndex;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/ProcessingInstructionImpl.cpp b/src/xercesc/dom/deprecated/ProcessingInstructionImpl.cpp
index f241a5410522926a6f2d6a161f04607b2690c277..2fb8f6bceedb2fbefe7bd36888ebd447945c8ff6 100644
--- a/src/xercesc/dom/deprecated/ProcessingInstructionImpl.cpp
+++ b/src/xercesc/dom/deprecated/ProcessingInstructionImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -64,6 +64,9 @@
#include "DOM_DOMException.hpp"
#include "DOM_Node.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
ProcessingInstructionImpl::ProcessingInstructionImpl(DocumentImpl *ownerDoc,
const DOMString &targt,
const DOMString &dat)
@@ -132,9 +135,9 @@ should be directed to. It is defined differently in HTML and XML.
In XML, a PI's "target" is the first (whitespace-delimited) token
following the "<?" token that begins the PI.
-
+
In HTML, target is always null.
-
+
Note that getNodeName is aliased to getTarget.
*/
DOMString ProcessingInstructionImpl::getTarget()
@@ -143,9 +146,9 @@ DOMString ProcessingInstructionImpl::getTarget()
};
-/**
-* Change the data content of this PI.
-* Note that setNodeValue is aliased to setData
+/**
+* Change the data content of this PI.
+* Note that setNodeValue is aliased to setData
* @see getData().
* @throws DOMException(NO_MODIFICATION_ALLOWED_ERR) if node is read-only.
*/
@@ -156,3 +159,6 @@ void ProcessingInstructionImpl::setData(const DOMString &arg)
null);
data = arg.clone();
};
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/ProcessingInstructionImpl.hpp b/src/xercesc/dom/deprecated/ProcessingInstructionImpl.hpp
index d9b13bcb8daac49bc5032e393299d8ee927ebaa8..d833eea5035fbcf206cd95d609420825567634d7 100644
--- a/src/xercesc/dom/deprecated/ProcessingInstructionImpl.hpp
+++ b/src/xercesc/dom/deprecated/ProcessingInstructionImpl.hpp
@@ -2,38 +2,38 @@
#define ProcessingInstructionImpl_HEADER_GUARD_
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -47,7 +47,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -72,6 +72,10 @@
#include <xercesc/util/XercesDefs.hpp>
#include "ChildNode.hpp"
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DocumentImpl;
@@ -97,5 +101,7 @@ public:
virtual void setData(const DOMString &arg);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/RangeImpl.cpp b/src/xercesc/dom/deprecated/RangeImpl.cpp
index 34ff1acdc242bfb98eb861354a2ffe6a120ba4e2..fc120b152da365c494ea720bf04c1ecae3dcb739 100644
--- a/src/xercesc/dom/deprecated/RangeImpl.cpp
+++ b/src/xercesc/dom/deprecated/RangeImpl.cpp
@@ -71,6 +71,8 @@
#include "DOM_DOMException.hpp"
#include "DOM_Text.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
//---------------------
// C'tor and D'tor
@@ -1692,4 +1694,6 @@ void RangeImpl::updateSplitInfo(TextImpl* oldNode, TextImpl* startNode, unsigned
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/RangeImpl.hpp b/src/xercesc/dom/deprecated/RangeImpl.hpp
index eae657e350c41a6c62037c8694add5acae315307..aef44c57b4088f99e083a039ceba9c36f3552f0c 100644
--- a/src/xercesc/dom/deprecated/RangeImpl.hpp
+++ b/src/xercesc/dom/deprecated/RangeImpl.hpp
@@ -77,6 +77,8 @@
#include "DOM_Document.hpp"
#include <xercesc/util/RefVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
typedef RefVectorOf<RangeImpl> Ranges;
@@ -201,4 +203,6 @@ private:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/RefCountedImpl.cpp b/src/xercesc/dom/deprecated/RefCountedImpl.cpp
index 17df84f79ea45284d7d6c5bad4f9b3897c6c06d7..a3a05d223eeee35a2bb76653e5e9bb4980162fbc 100644
--- a/src/xercesc/dom/deprecated/RefCountedImpl.cpp
+++ b/src/xercesc/dom/deprecated/RefCountedImpl.cpp
@@ -60,6 +60,8 @@
#include "RefCountedImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
RefCountedImpl::RefCountedImpl()
{
@@ -111,5 +113,7 @@ void RefCountedImpl::unreferenced()
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/RefCountedImpl.hpp b/src/xercesc/dom/deprecated/RefCountedImpl.hpp
index 13ac8caa28d04aaff5ee4fbbbe099f73564ead5c..16282e934d194876cce10970593cbe233ca1828a 100644
--- a/src/xercesc/dom/deprecated/RefCountedImpl.hpp
+++ b/src/xercesc/dom/deprecated/RefCountedImpl.hpp
@@ -73,6 +73,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class CDOM_EXPORT RefCountedImpl
{
@@ -99,4 +101,6 @@ public:
// over its life time.)
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/TextImpl.cpp b/src/xercesc/dom/deprecated/TextImpl.cpp
index 5b0eeed3186dd858a59d126451cd6c6a2c33f95b..08c0f96f1fa9870b47277cab6960c9f5cb32560d 100644
--- a/src/xercesc/dom/deprecated/TextImpl.cpp
+++ b/src/xercesc/dom/deprecated/TextImpl.cpp
@@ -66,6 +66,9 @@
#include "DStringPool.hpp"
#include "RangeImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
static DOMString *gText = 0; // will be lazily initialized to point to "#text"
static XMLRegisterCleanup gTextCleanup;
@@ -167,3 +170,6 @@ void TextImpl::reinitTextImpl() {
gText = 0;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/TextImpl.hpp b/src/xercesc/dom/deprecated/TextImpl.hpp
index d6c681479d4201a6df8601723f4597dba16497c3..b70ea559507860c19336a706d773349824427a0e 100644
--- a/src/xercesc/dom/deprecated/TextImpl.hpp
+++ b/src/xercesc/dom/deprecated/TextImpl.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -75,6 +75,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "CharacterDataImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CDOM_EXPORT TextImpl: public CharacterDataImpl {
public:
TextImpl(DocumentImpl *ownerDoc, const DOMString &data);
@@ -90,12 +93,14 @@ public:
// -----------------------------------------------------------------------
// Notification that lazy data has been deleted
// -----------------------------------------------------------------------
- static void reinitTextImpl();
+ static void reinitTextImpl();
protected:
virtual void setIgnorableWhitespace(bool ignorable);
friend class DOMParser;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/TreeWalkerImpl.cpp b/src/xercesc/dom/deprecated/TreeWalkerImpl.cpp
index 393a0f28d9ec8dcb5d3d0e497d1dfc06cef1e2b9..4665641903db468495b7e7cc151702baed53df73 100644
--- a/src/xercesc/dom/deprecated/TreeWalkerImpl.cpp
+++ b/src/xercesc/dom/deprecated/TreeWalkerImpl.cpp
@@ -63,6 +63,8 @@
#include "DOM_DOMException.hpp"
#include "DocumentImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
/** constructor */
TreeWalkerImpl::TreeWalkerImpl (
@@ -549,3 +551,5 @@ short TreeWalkerImpl::acceptNode (DOM_Node node) {
}
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/TreeWalkerImpl.hpp b/src/xercesc/dom/deprecated/TreeWalkerImpl.hpp
index fbce5473b9a75013778a47a21957d6c3ffef688d..ca8fad82ce7cd89f5164a8f1acce584a9f73ec87 100644
--- a/src/xercesc/dom/deprecated/TreeWalkerImpl.hpp
+++ b/src/xercesc/dom/deprecated/TreeWalkerImpl.hpp
@@ -74,6 +74,7 @@
#include "DOM_TreeWalker.hpp"
#include "RefCountedImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
class CDOM_EXPORT TreeWalkerImpl : public RefCountedImpl {
@@ -201,4 +202,6 @@ private:
bool fExpandEntityReferences;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/deprecated/XMLDeclImpl.cpp b/src/xercesc/dom/deprecated/XMLDeclImpl.cpp
index b496d4a8bf64a42fa11c62766c27285070e20151..915e1669d08f970237efbec01b5cf909ddec1116 100644
--- a/src/xercesc/dom/deprecated/XMLDeclImpl.cpp
+++ b/src/xercesc/dom/deprecated/XMLDeclImpl.cpp
@@ -64,6 +64,9 @@
#include "DStringPool.hpp"
#include "DocumentImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
static DOMString *gNam = 0; // will be lazily initialized to "#xmldecl"
static XMLRegisterCleanup gNamCleanup;
@@ -159,3 +162,6 @@ void XMLDeclImpl::reinitXMLDeclImpl() {
gNam = 0;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/deprecated/XMLDeclImpl.hpp b/src/xercesc/dom/deprecated/XMLDeclImpl.hpp
index b8030ef91a3c127affc42009e406b39e9066582e..04c35334a9d5307c613c3291610ac90ea72e71c3 100644
--- a/src/xercesc/dom/deprecated/XMLDeclImpl.hpp
+++ b/src/xercesc/dom/deprecated/XMLDeclImpl.hpp
@@ -73,6 +73,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "ChildNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMString;
class CDOM_EXPORT XMLDeclImpl: public ChildNode {
@@ -87,7 +90,7 @@ private:
public:
XMLDeclImpl(DocumentImpl *ownerDoc);
- XMLDeclImpl(DocumentImpl *ownerDoc, const DOMString& version,
+ XMLDeclImpl(DocumentImpl *ownerDoc, const DOMString& version,
const DOMString& encoding, const DOMString& standalone);
XMLDeclImpl(const XMLDeclImpl &other, bool deep=false);
virtual ~XMLDeclImpl();
@@ -96,7 +99,7 @@ public:
virtual DOMString getNodeName();
virtual short getNodeType();
-
+
virtual DOMString getVersion() const;
virtual DOMString getEncoding() const;
virtual DOMString getStandalone() const;
@@ -108,8 +111,10 @@ public:
// -----------------------------------------------------------------------
// Notification that lazy data has been deleted
// -----------------------------------------------------------------------
- static void reinitXMLDeclImpl();
+ static void reinitXMLDeclImpl();
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMAttrImpl.cpp b/src/xercesc/dom/impl/DOMAttrImpl.cpp
index 09281cf94d363739fe5648a97fa4f44dec0fa7e6..bd38540542b5f4a72361db1f9eb2510bc538200f 100644
--- a/src/xercesc/dom/impl/DOMAttrImpl.cpp
+++ b/src/xercesc/dom/impl/DOMAttrImpl.cpp
@@ -67,6 +67,7 @@
#include "DOMCasts.hpp"
#include "DOMNodeIDMap.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
DOMAttrImpl::DOMAttrImpl(DOMDocument *ownerDoc, const XMLCh *aName)
: fNode(ownerDoc), fParent (ownerDoc)
@@ -354,4 +355,5 @@ DOMNode* DOMAttrImpl::rename(const XMLCh* namespaceURI, const XMLCh* name)
const XMLCh* DOMAttrImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); };
DOMNode* DOMAttrImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMAttrImpl.hpp b/src/xercesc/dom/impl/DOMAttrImpl.hpp
index 0b51aa53fb433b1020f0de5926b62a6aa6f3913a..891afdad9a93cc74105b31f6b1ed4c0c5c3adab3 100644
--- a/src/xercesc/dom/impl/DOMAttrImpl.hpp
+++ b/src/xercesc/dom/impl/DOMAttrImpl.hpp
@@ -78,6 +78,8 @@
#include <xercesc/dom/DOMAttr.hpp>
#include <xercesc/framework/XMLBuffer.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class DOMElementImpl;
class CDOM_EXPORT DOMAttrImpl: public DOMAttr {
@@ -112,4 +114,6 @@ private:
void getTextValue(DOMNode* node, XMLBuffer& buf) const;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMAttrMapImpl.cpp b/src/xercesc/dom/impl/DOMAttrMapImpl.cpp
index 33edf74b47fe1aaa7150aedb3adb03141a50cd2e..2c1ba10c352ba2a54ca8caff18a667470fdee191 100644
--- a/src/xercesc/dom/impl/DOMAttrMapImpl.cpp
+++ b/src/xercesc/dom/impl/DOMAttrMapImpl.cpp
@@ -69,6 +69,8 @@
#include "DOMDocumentImpl.hpp"
#include <xercesc/dom/DOMException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
DOMAttrMapImpl::DOMAttrMapImpl(DOMNode *ownerNod)
: DOMNamedNodeMapImpl(ownerNod)
{
@@ -246,3 +248,5 @@ void DOMAttrMapImpl::moveSpecifiedAttributes(DOMAttrMapImpl* srcmap) {
}
} // moveSpecifiedAttributes(AttributeMap):void
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMAttrMapImpl.hpp b/src/xercesc/dom/impl/DOMAttrMapImpl.hpp
index d3c4ae0abf8ea3604911b6347e3eeabb60f7d283..18fe7c54c86409e3fd9962bf1b42eddf4f2f9659 100644
--- a/src/xercesc/dom/impl/DOMAttrMapImpl.hpp
+++ b/src/xercesc/dom/impl/DOMAttrMapImpl.hpp
@@ -74,6 +74,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOMNamedNodeMapImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMNode;
class DOMNamedNodeMap;
@@ -120,5 +123,7 @@ inline void DOMAttrMapImpl::hasDefaults(bool value)
attrDefaults = value;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMAttrNSImpl.cpp b/src/xercesc/dom/impl/DOMAttrNSImpl.cpp
index 6154171794b72574a7a012747fac7a76a45e49a7..b723681b3a05f1f51f8a6fed3a2b1eb0a040fae3 100644
--- a/src/xercesc/dom/impl/DOMAttrNSImpl.cpp
+++ b/src/xercesc/dom/impl/DOMAttrNSImpl.cpp
@@ -67,6 +67,8 @@
#include "assert.h"
+XERCES_CPP_NAMESPACE_BEGIN
+
DOMAttrNSImpl::DOMAttrNSImpl(DOMDocument *ownerDoc, const XMLCh *nam) :
DOMAttrImpl(ownerDoc, nam)
{
@@ -254,3 +256,5 @@ void DOMAttrNSImpl::setName(const XMLCh* namespaceURI, const XMLCh* qualifiedNam
this -> fNamespaceURI = (URI == 0) ? 0 : ownerDoc->getPooledString(URI);
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMAttrNSImpl.hpp b/src/xercesc/dom/impl/DOMAttrNSImpl.hpp
index 838c5ca2a7fb108fcae4a6bc41bb9b61275d1124..5206c0dff1e9688aba0f969de4d3c44554c229f2 100644
--- a/src/xercesc/dom/impl/DOMAttrNSImpl.hpp
+++ b/src/xercesc/dom/impl/DOMAttrNSImpl.hpp
@@ -72,6 +72,8 @@
#include "DOMAttrImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
class CDOM_EXPORT DOMAttrNSImpl: public DOMAttrImpl {
protected:
@@ -101,4 +103,6 @@ public:
void setName(const XMLCh* namespaceURI, const XMLCh* name);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp b/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp
index cbc82f87ca28cf379c86a31a7119b266ac81ae2d..9de86a501dc609648d8292a8e31b52ac2b9e7268 100644
--- a/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp
+++ b/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp
@@ -67,6 +67,9 @@
#include <xercesc/dom/DOMException.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
DOMCDATASectionImpl::DOMCDATASectionImpl(DOMDocument *ownerDoc,
const XMLCh *dat)
: fNode(ownerDoc), fParent(ownerDoc), fCharacterData(ownerDoc, dat)
@@ -254,4 +257,6 @@ void DOMCDATASectionImpl::release()
void DOMCDATASectionImpl::setData(const XMLCh *data) {fCharacterData.setData(this, data);};
void DOMCDATASectionImpl::setNodeValue(const XMLCh *nodeValue) {fCharacterData.setNodeValue (this, nodeValue); };
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp b/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp
index 4d2a4149997159d24defdb32724a58f041c1b27a..a42e30a3d7bfeeb4a79d994c1d60b6331f94e773 100644
--- a/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp
+++ b/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp
@@ -77,6 +77,8 @@
#include "DOMParentNode.hpp"
#include "DOMCharacterDataImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
class CDOM_EXPORT DOMCDATASectionImpl: public DOMCDATASection {
private:
@@ -124,5 +126,7 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMCasts.hpp b/src/xercesc/dom/impl/DOMCasts.hpp
index 6951cf0c25a5cd24381bbf7d6ac480d45c7e2331..503a67ae4930e7bcd661e24cf9ff35215cbbc932 100644
--- a/src/xercesc/dom/impl/DOMCasts.hpp
+++ b/src/xercesc/dom/impl/DOMCasts.hpp
@@ -118,6 +118,9 @@
#include "DOMElementImpl.hpp"
#include "DOMTextImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
static inline DOMNodeImpl *castToNodeImpl(const DOMNode *p)
{
DOMElementImpl *pE = (DOMElementImpl *)p;
@@ -162,4 +165,6 @@ static inline DOMNodeImpl *castToNodeImpl(const DOMParentNode *p)
return (DOMNodeImpl *)retPtr;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp b/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp
index cfb6634bdbc3853dab1f2d6760e5cc4fd1297ebd..bbd1e94bfb6ea57c741e8710d20ba43b594d1fce 100644
--- a/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp
+++ b/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp
@@ -67,6 +67,8 @@
#include "DOMStringPool.hpp"
#include <xercesc/util/XMLUniDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
DOMCharacterDataImpl::DOMCharacterDataImpl(DOMDocument *doc, const XMLCh *dat)
: fDoc(0)
@@ -317,3 +319,5 @@ void DOMCharacterDataImpl::releaseBuffer() {
fDoc->releaseBuffer(fDataBuf);
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMCharacterDataImpl.hpp b/src/xercesc/dom/impl/DOMCharacterDataImpl.hpp
index 74c80ad11638a952406fa01295f85b4eb8e70683..ea620ecbf60a994180ce1527707dd1fe87aaf405 100644
--- a/src/xercesc/dom/impl/DOMCharacterDataImpl.hpp
+++ b/src/xercesc/dom/impl/DOMCharacterDataImpl.hpp
@@ -73,6 +73,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMNode;
class DOMDocument;
class DOMDocumentImpl;
@@ -110,5 +113,7 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMChildNode.cpp b/src/xercesc/dom/impl/DOMChildNode.cpp
index 7190c880bb64e6aa2173367d5d27850ec52ed1da..6029ef4a8378b6e467cb117cae2affb8f79af9f7 100644
--- a/src/xercesc/dom/impl/DOMChildNode.cpp
+++ b/src/xercesc/dom/impl/DOMChildNode.cpp
@@ -65,6 +65,9 @@
#include "DOMChildNode.hpp"
#include "DOMCasts.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
DOMChildNode::DOMChildNode()
{
this->previousSibling = 0;
@@ -109,3 +112,6 @@ DOMNode * DOMChildNode::getPreviousSibling(const DOMNode *thisNode) const {
// parent's lastChild, but we hide that
return castToNodeImpl(thisNode)->isFirstChild() ? 0 : previousSibling;
};
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMChildNode.hpp b/src/xercesc/dom/impl/DOMChildNode.hpp
index 999c20df7d5e9abc2a8584a98d2d90b7dd5a0135..c1b248ab9ea4fb89d00603b21fd38528748ac7a0 100644
--- a/src/xercesc/dom/impl/DOMChildNode.hpp
+++ b/src/xercesc/dom/impl/DOMChildNode.hpp
@@ -77,6 +77,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class DOMDocument;
class DOMNode;
@@ -98,4 +100,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMCommentImpl.cpp b/src/xercesc/dom/impl/DOMCommentImpl.cpp
index 660780e10c5c54e6e92a707c8310ab16cf0736b2..3b38171a9283f23579f87ca80899739a9a050d2f 100644
--- a/src/xercesc/dom/impl/DOMCommentImpl.cpp
+++ b/src/xercesc/dom/impl/DOMCommentImpl.cpp
@@ -66,6 +66,9 @@
#include <xercesc/dom/DOMException.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
DOMCommentImpl::DOMCommentImpl(DOMDocument *ownerDoc, const XMLCh *dat)
: fNode(ownerDoc), fCharacterData(ownerDoc, dat)
{
@@ -183,3 +186,5 @@ void DOMCommentImpl::release()
void DOMCommentImpl::setData(const XMLCh *data) {fCharacterData.setData(this, data);};
void DOMCommentImpl::setNodeValue(const XMLCh *nodeValue) {fCharacterData.setNodeValue (this, nodeValue); };
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMCommentImpl.hpp b/src/xercesc/dom/impl/DOMCommentImpl.hpp
index 5153718a86067d66e9ef9951babfeb28a0f7206e..bb34d19cc65a2b90471e331ce1a55c5d4b6ab49b 100644
--- a/src/xercesc/dom/impl/DOMCommentImpl.hpp
+++ b/src/xercesc/dom/impl/DOMCommentImpl.hpp
@@ -79,6 +79,9 @@
#include "DOMChildNode.hpp"
#include "DOMCharacterDataImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CDOM_EXPORT DOMCommentImpl: public DOMComment {
public:
DOMNodeImpl fNode;
@@ -106,5 +109,7 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp b/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp
index 6adc58a76dd255156e9f17d3fd3d4d7d5e67e94c..8ec99e4faa1a26d0f992e8fed95370cdcf3b3f36 100644
--- a/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp
+++ b/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp
@@ -66,6 +66,9 @@
#include <xercesc/util/XMLUniDefs.hpp>
#include <limits.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
static const XMLCh kAstr[] = {chAsterisk, chNull};
DOMDeepNodeListImpl::DOMDeepNodeListImpl(const DOMNode *rootNode,
@@ -250,3 +253,5 @@ DOMNode *DOMDeepNodeListImpl::nextMatchingElementAfter(DOMNode *current)
return 0;
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp b/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp
index accfbf10667cd450b5ec9b6ec9bdc4a18e1c42c8..b694c72dba714af28acfd6e624aea3064f522762 100644
--- a/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp
+++ b/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp
@@ -73,6 +73,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/dom/DOMNodeList.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMNode;
@@ -104,4 +107,6 @@ private:
DOMNode* nextMatchingElementAfter(DOMNode *current);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMDeepNodeListPool.c b/src/xercesc/dom/impl/DOMDeepNodeListPool.c
index da266cc45ab9c89161a98c5d52aebffbf8398697..d0d45bf7306daf2c24663ba21cd69ed132ac1474 100644
--- a/src/xercesc/dom/impl/DOMDeepNodeListPool.c
+++ b/src/xercesc/dom/impl/DOMDeepNodeListPool.c
@@ -62,10 +62,14 @@
// ---------------------------------------------------------------------------
// Include
// ---------------------------------------------------------------------------
+#include <xercesc/util/XercesDefs.hpp>
#if defined(XERCES_TMPLSINC)
#include <xercesc/dom/impl/DOMDeepNodeListPool.hpp>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
+
+
// ---------------------------------------------------------------------------
// DOMDeepNodeListPool: Constructors and Destructor
@@ -416,3 +420,5 @@ findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* con
return 0;
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp b/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp
index 368dd1b4867cd21cfbfa0b011b1e136f67cd0b71..98178b0ced83cc71619024a3977ddd3cf82123bc 100644
--- a/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp
+++ b/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp
@@ -83,6 +83,9 @@
#include <xercesc/util/HashXMLCh.hpp>
#include <xercesc/util/HashPtr.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
// This hash table is modified from RefHash3KeysIdPool with first key as object ptr (DOMNode),
// second and third keys are both XMLCh* string
@@ -230,6 +233,8 @@ private:
XMLSize_t fIdCounter;
};
+XERCES_CPP_NAMESPACE_END
+
#if !defined(XERCES_TMPLSINC)
#include <xercesc/dom/impl/DOMDeepNodeListPool.c>
#endif
diff --git a/src/xercesc/dom/impl/DOMDocumentFragmentImpl.cpp b/src/xercesc/dom/impl/DOMDocumentFragmentImpl.cpp
index 99adf89566bbd7e9aa09d1dfd393d3bc1571ab50..c6c2b5586f945d2045eb4f8ab7be19f587ae9412 100644
--- a/src/xercesc/dom/impl/DOMDocumentFragmentImpl.cpp
+++ b/src/xercesc/dom/impl/DOMDocumentFragmentImpl.cpp
@@ -65,6 +65,8 @@
#include <xercesc/dom/DOMException.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
static const XMLCh * nam; // Will be lazily initialized to "#document-fragment"
@@ -174,4 +176,6 @@ void DOMDocumentFragmentImpl::release()
const XMLCh* DOMDocumentFragmentImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); };
DOMNode* DOMDocumentFragmentImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMDocumentFragmentImpl.hpp b/src/xercesc/dom/impl/DOMDocumentFragmentImpl.hpp
index 32bf9203bd644a306014e081876f8ab101552606..cae7039bf75148d335906fe41363d78688230bcd 100644
--- a/src/xercesc/dom/impl/DOMDocumentFragmentImpl.hpp
+++ b/src/xercesc/dom/impl/DOMDocumentFragmentImpl.hpp
@@ -74,6 +74,9 @@
#include "DOMParentNode.hpp"
#include "DOMNodeImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CDOM_EXPORT DOMDocumentFragmentImpl: public DOMDocumentFragment {
private:
DOMNodeImpl fNode;
@@ -95,5 +98,7 @@ public:
DOMNODE_FUNCTIONS;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMDocumentImpl.cpp b/src/xercesc/dom/impl/DOMDocumentImpl.cpp
index cd265113b3f145524fdc03ed38bd7fbc60c1f0a9..3a7dc4a381d6f26b53a4d6e761869dded3e50cfb 100644
--- a/src/xercesc/dom/impl/DOMDocumentImpl.cpp
+++ b/src/xercesc/dom/impl/DOMDocumentImpl.cpp
@@ -94,6 +94,9 @@
#include <xercesc/internal/XMLReader.hpp>
#include <xercesc/util/HashPtr.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
//
// Constructors. Warning - be very careful with the ordering of initialization
// of the heap. Ordering depends on the order of declaration
@@ -1309,3 +1312,5 @@ void * DOMDocumentImpl::allocate(size_t amount, NodeObjectType type)
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMDocumentImpl.hpp b/src/xercesc/dom/impl/DOMDocumentImpl.hpp
index b78a00951a605bb863a49b633ed3ab8d4bddbba0..8908a0f6261b6268ec739c62c9d30d0ebdb9d180 100644
--- a/src/xercesc/dom/impl/DOMDocumentImpl.hpp
+++ b/src/xercesc/dom/impl/DOMDocumentImpl.hpp
@@ -84,6 +84,8 @@
#include "DOMParentNode.hpp"
#include "DOMDeepNodeListPool.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
class DOMAttrImpl;
class DOMCDATASectionImpl;
@@ -371,6 +373,10 @@ private:
};
+XERCES_CPP_NAMESPACE_END
+
+XERCES_CPP_NAMESPACE_USE
+
// ---------------------------------------------------------------------------
//
// Operator new. Global overloaded version, lets any object be allocated on
diff --git a/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp b/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp
index 943b95e72278bbe5964485a488de7a294f42df93..6f62be965ef44bfe0aff307cf005ab07a477db48 100644
--- a/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp
+++ b/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp
@@ -67,6 +67,8 @@
#include "DOMDocumentImpl.hpp"
#include "DOMCasts.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
DOMDocumentTypeImpl::DOMDocumentTypeImpl(DOMDocument *ownerDoc,
const XMLCh *dtName,
@@ -570,3 +572,5 @@ bool DOMDocumentTypeImpl::isEqualNode(const DOMNode* arg) const
return fParent.isEqualNode(arg);
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp b/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp
index 14641788396fce1b8606af2aa56c72f9dbce0705..dc9981e298d305cd9633b87cabd55c56aedeb84a 100644
--- a/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp
+++ b/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp
@@ -78,6 +78,9 @@
#include "DOMChildNode.hpp"
#include "DOMParentNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class NamedNodeMapImpl;
class CDOM_EXPORT DOMDocumentTypeImpl: public DOMDocumentType {
@@ -131,4 +134,6 @@ public:
virtual const XMLCh * getInternalSubset() const;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMElementImpl.cpp b/src/xercesc/dom/impl/DOMElementImpl.cpp
index 00d6f03c9882291ed19a6bbd5583c71fc1a1a856..d77b9c52e74ab5b95ece31818696e01db035e7b2 100644
--- a/src/xercesc/dom/impl/DOMElementImpl.cpp
+++ b/src/xercesc/dom/impl/DOMElementImpl.cpp
@@ -77,6 +77,9 @@
#include "DOMDocumentTypeImpl.hpp"
#include "DOMNamedNodeMapImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMAttr;
DOMElementImpl::DOMElementImpl(DOMDocument *ownerDoc, const XMLCh *eName)
@@ -629,3 +632,5 @@ DOMNode* DOMElementImpl::rename(const XMLCh* namespaceURI, const XMLCh* name)
}
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMElementImpl.hpp b/src/xercesc/dom/impl/DOMElementImpl.hpp
index 0545840c06f46212a020a26991b6346649f1530b..ccf7a38644af72277c61195dea8a05460c6e4042 100644
--- a/src/xercesc/dom/impl/DOMElementImpl.hpp
+++ b/src/xercesc/dom/impl/DOMElementImpl.hpp
@@ -82,6 +82,9 @@
//#include "AttrImpl.hpp"
#include "DOMAttrMapImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMNodeList;
class DOMAttrMapImpl;
class DOMDocument;
@@ -149,4 +152,6 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMElementNSImpl.cpp b/src/xercesc/dom/impl/DOMElementNSImpl.cpp
index 09abc14f3f9dbd42d57691900ce5d0184fa1cf37..a973073c8191019ae70a8e1551911d488fb9ddc4 100644
--- a/src/xercesc/dom/impl/DOMElementNSImpl.cpp
+++ b/src/xercesc/dom/impl/DOMElementNSImpl.cpp
@@ -64,6 +64,9 @@
#include <xercesc/dom/DOMException.hpp>
#include <xercesc/util/XMLUri.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
DOMElementNSImpl::DOMElementNSImpl(DOMDocument *ownerDoc, const XMLCh *nam) :
DOMElementImpl(ownerDoc, nam)
{
@@ -261,3 +264,5 @@ void DOMElementNSImpl::setName(const XMLCh *namespaceURI,
this -> fNamespaceURI = (URI == 0) ? 0 : ownerDoc->getPooledString(URI);
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMElementNSImpl.hpp b/src/xercesc/dom/impl/DOMElementNSImpl.hpp
index 576b09d2069c17c9c914a96e8ad8b904e3024a7e..9d6b3700b771d5fa95ce8936f73c97fd65001f2c 100644
--- a/src/xercesc/dom/impl/DOMElementNSImpl.hpp
+++ b/src/xercesc/dom/impl/DOMElementNSImpl.hpp
@@ -73,6 +73,8 @@
#include "DOMElementImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
class CDOM_EXPORT DOMElementNSImpl: public DOMElementImpl {
protected:
@@ -104,4 +106,6 @@ public:
void setName(const XMLCh* namespaceURI, const XMLCh* name);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMEntityImpl.cpp b/src/xercesc/dom/impl/DOMEntityImpl.cpp
index 9774b30b46fa484e04722a2a1c1f83d581422244..a1e6da4e8e56fa622cd175a410e2867d53183454 100644
--- a/src/xercesc/dom/impl/DOMEntityImpl.cpp
+++ b/src/xercesc/dom/impl/DOMEntityImpl.cpp
@@ -64,6 +64,8 @@
#include "DOMEntityImpl.hpp"
#include "DOMDocumentImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
DOMEntityImpl::DOMEntityImpl(DOMDocument *ownerDoc, const XMLCh *eName)
: fNode(ownerDoc),
@@ -329,3 +331,5 @@ void DOMEntityImpl::setVersion(const XMLCh* version){
fVersion = doc->cloneString(version);
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMEntityImpl.hpp b/src/xercesc/dom/impl/DOMEntityImpl.hpp
index a101b5e00493125a4d3ecc274be28748dae31a53..83a9446a1061ea3230cb45bef9e5e0635895f5a9 100644
--- a/src/xercesc/dom/impl/DOMEntityImpl.hpp
+++ b/src/xercesc/dom/impl/DOMEntityImpl.hpp
@@ -75,6 +75,9 @@
#include "DOMParentNode.hpp"
#include <xercesc/dom/DOMEntity.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMEntityReference;
class CDOM_EXPORT DOMEntityImpl: public DOMEntity {
@@ -129,5 +132,7 @@ public:
virtual void setBaseURI(const XMLCh *arg);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp b/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp
index f7b8083aa1afa08aadac15e5d4d6b391167a083d..ad60caf5867edfc08b31ffa6dfeb431ac24d2570 100644
--- a/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp
+++ b/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp
@@ -67,6 +67,9 @@
#include <xercesc/dom/DOMException.hpp>
#include <xercesc/dom/DOMNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
DOMEntityReferenceImpl::DOMEntityReferenceImpl(DOMDocument *ownerDoc,
const XMLCh *entityName)
: fNode(ownerDoc), fParent(ownerDoc), fBaseURI(0)
@@ -225,3 +228,5 @@ const XMLCh* DOMEntityReferenceImpl::getBaseURI() const
const XMLCh* DOMEntityReferenceImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); };
DOMNode* DOMEntityReferenceImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp b/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp
index 2fbcd0a4a1bfb1072c2440ac4a06bfc17f0ec0af..3c54dc28f15661f5a3c8e69f35b4ecffffeba4c3 100644
--- a/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp
+++ b/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp
@@ -77,6 +77,9 @@
#include "DOMChildNode.hpp"
#include "DOMNodeImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CDOM_EXPORT DOMEntityReferenceImpl: public DOMEntityReference
{
private:
@@ -100,5 +103,7 @@ public:
virtual void setReadOnly(bool readOnly,bool deep);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMErrorImpl.cpp b/src/xercesc/dom/impl/DOMErrorImpl.cpp
index d5835c38a6b1c03117838d43d131a18391872772..7b10d0c6f3728fd8c121ba5a99bb717a6096a4ae 100644
--- a/src/xercesc/dom/impl/DOMErrorImpl.cpp
+++ b/src/xercesc/dom/impl/DOMErrorImpl.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:07:34 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/07/15 19:25:49 tng
* DOM L3: declare a dummy DOMError::set/getRelatedException
*
@@ -71,6 +74,9 @@
#include <xercesc/dom/DOMException.hpp>
#include <xercesc/dom/DOMLocator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
// ---------------------------------------------------------------------------
// DOMErrorImpl: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -114,3 +120,5 @@ void DOMErrorImpl::setRelatedException(void* exception) const
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0);
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMErrorImpl.hpp b/src/xercesc/dom/impl/DOMErrorImpl.hpp
index 47b896b3a249792e48e420415f6c642ab1db0361..2643781e393df978bb7446eba6e3e5ec282d7c8f 100644
--- a/src/xercesc/dom/impl/DOMErrorImpl.hpp
+++ b/src/xercesc/dom/impl/DOMErrorImpl.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:07:34 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/07/15 19:25:49 tng
* DOM L3: declare a dummy DOMError::set/getRelatedException
*
@@ -73,6 +76,9 @@
#include <xercesc/dom/DOMError.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
/**
* Introduced in DOM Level 3
* Implementation of a DOMError interface.
@@ -264,4 +270,6 @@ inline void DOMErrorImpl::setAdoptLocation(const bool value)
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMImplementationImpl.cpp b/src/xercesc/dom/impl/DOMImplementationImpl.cpp
index 0e934a67c94fb60cf24612212353969363cbb4c7..e19961e81a339d1b845fc7bcafb8b58e68a4ce13 100644
--- a/src/xercesc/dom/impl/DOMImplementationImpl.cpp
+++ b/src/xercesc/dom/impl/DOMImplementationImpl.cpp
@@ -72,6 +72,9 @@
#include <xercesc/util/XMLStringTokenizer.hpp>
#include <xercesc/parsers/DOMBuilderImpl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
// ------------------------------------------------------------
//
// Static constants. These are lazily initialized on first usage.
@@ -274,3 +277,5 @@ DOMImplementation* DOMImplementationImpl::getDOMImplementation(const XMLCh* feat
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMImplementationImpl.hpp b/src/xercesc/dom/impl/DOMImplementationImpl.hpp
index 7f1a86d501ae79ed87b6883b76c7050b83d3b16d..c017f86f861bd9075b4fcdbbfe2d14ee51deaadd 100644
--- a/src/xercesc/dom/impl/DOMImplementationImpl.hpp
+++ b/src/xercesc/dom/impl/DOMImplementationImpl.hpp
@@ -73,6 +73,9 @@
#include <xercesc/dom/DOMImplementation.hpp>
#include <xercesc/dom/DOMImplementationSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMImplementationImpl: public DOMImplementation,
public DOMImplementationSource
{
@@ -121,4 +124,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMImplementationRegistry.cpp b/src/xercesc/dom/impl/DOMImplementationRegistry.cpp
index 463ffc6a1ecaa8d68db49eee64958b95e7ed7efb..f137a8633a7705c819604bdd021b005afec0e191 100644
--- a/src/xercesc/dom/impl/DOMImplementationRegistry.cpp
+++ b/src/xercesc/dom/impl/DOMImplementationRegistry.cpp
@@ -66,6 +66,9 @@
#include <xercesc/dom/DOMImplementation.hpp>
#include "DOMImplementationImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
// -----------------------------------------------------------------------
// Static constants. These are lazily initialized on first usage.
// (Static constructors can not be safely used because
@@ -173,3 +176,5 @@ void DOMImplementationRegistry::addSource (DOMImplementationSource* source) {
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMLocatorImpl.cpp b/src/xercesc/dom/impl/DOMLocatorImpl.cpp
index 39ed55013c1a2b6e1925859dbad975f23a80c6c6..309eca6f9e407acb874f9512eb7dd1b894f61824 100644
--- a/src/xercesc/dom/impl/DOMLocatorImpl.cpp
+++ b/src/xercesc/dom/impl/DOMLocatorImpl.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:07:34 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/05/27 18:25:41 tng
* To get ready for 64 bit large file, use XMLSSize_t to represent line and column number.
*
@@ -69,6 +72,9 @@
#include "DOMLocatorImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
// ---------------------------------------------------------------------------
// DOMLocatorImpl: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -99,3 +105,5 @@ DOMLocatorImpl::~DOMLocatorImpl()
{
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMLocatorImpl.hpp b/src/xercesc/dom/impl/DOMLocatorImpl.hpp
index bb18236a1fef9b7ea216affb10f07ea107523e1d..0da5073d34f3535a051e28ae99d3066ef249479b 100644
--- a/src/xercesc/dom/impl/DOMLocatorImpl.hpp
+++ b/src/xercesc/dom/impl/DOMLocatorImpl.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:07:34 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/05/30 19:26:00 knoaman
* documentation update
*
@@ -73,6 +76,9 @@
#include <xercesc/dom/DOMLocator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
/**
* Introduced in DOM Level 3
@@ -315,4 +321,6 @@ inline void DOMLocatorImpl::setURI(const XMLCh* const uri)
fURI = uri;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMNamedNodeMapImpl.cpp b/src/xercesc/dom/impl/DOMNamedNodeMapImpl.cpp
index cce5a9c91f52e271e6896a44233f5e7b3bcad76c..6ee59e03c4aaf566056273edac7e4f5404b17a65 100644
--- a/src/xercesc/dom/impl/DOMNamedNodeMapImpl.cpp
+++ b/src/xercesc/dom/impl/DOMNamedNodeMapImpl.cpp
@@ -70,7 +70,7 @@
#include "DOMDocumentImpl.hpp"
#include "DOMNodeImpl.hpp"
-
+XERCES_CPP_NAMESPACE_BEGIN
DOMNamedNodeMapImpl::DOMNamedNodeMapImpl(DOMNode *ownerNod)
@@ -450,3 +450,5 @@ DOMNode * DOMNamedNodeMapImpl::removeNamedItemAt(XMLSize_t index)
return n;
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp b/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp
index c5a6501d45022703f4112fd005205c0067f72fe1..da3ca78207c77a90bc0f2efef825192c68fd06dd 100644
--- a/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp
+++ b/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp
@@ -73,6 +73,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/dom/DOMNamedNodeMap.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMNodeVector;
class DOMNode;
class DOMDocument;
@@ -117,5 +120,7 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMNodeIDMap.cpp b/src/xercesc/dom/impl/DOMNodeIDMap.cpp
index 0bfe4e8af907d10fb22b317573ea97772025abdb..15d6ae67e43655166a45398e6f73518373671b17 100644
--- a/src/xercesc/dom/impl/DOMNodeIDMap.cpp
+++ b/src/xercesc/dom/impl/DOMNodeIDMap.cpp
@@ -66,6 +66,9 @@
#include <xercesc/util/RuntimeException.hpp>
#include <stdio.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
static const int gPrimes[] = {997, 9973, 99991, 999983, 0 }; // To do - add a few more.
static const float gMaxFill = 0.8f; // The maximum fraction of the total
@@ -279,4 +282,6 @@ void DOMNodeIDMap::growTable()
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMNodeIDMap.hpp b/src/xercesc/dom/impl/DOMNodeIDMap.hpp
index f4fec76713be75c6f4d8ee55b814659f9af91314..08a5e961f567e9525f9a03ae3c511eeb2133468c 100644
--- a/src/xercesc/dom/impl/DOMNodeIDMap.hpp
+++ b/src/xercesc/dom/impl/DOMNodeIDMap.hpp
@@ -70,6 +70,9 @@
// name is substituded for the *.
//
+#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// Class DOMNodeIDMap is a hash table that is used in the implementation of
@@ -119,4 +122,6 @@ private:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMNodeImpl.cpp b/src/xercesc/dom/impl/DOMNodeImpl.cpp
index 1a3abdbe64c3024ad7af0af107e2d0c3927a64e0..d3e09322bb7c293126223aae483ebba054e7b94a 100644
--- a/src/xercesc/dom/impl/DOMNodeImpl.cpp
+++ b/src/xercesc/dom/impl/DOMNodeImpl.cpp
@@ -77,6 +77,10 @@
#include <xercesc/util/PlatformUtils.hpp>
#include <stdio.h>
#include <assert.h>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+
const unsigned short DOMNodeImpl::READONLY = 0x1<<0;
const unsigned short DOMNodeImpl::SYNCDATA = 0x1<<1;
const unsigned short DOMNodeImpl::SYNCCHILDREN = 0x1<<2;
@@ -977,3 +981,5 @@ void DOMNodeImpl::release()
throw DOMException(DOMException::INVALID_ACCESS_ERR,0);
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMNodeImpl.hpp b/src/xercesc/dom/impl/DOMNodeImpl.hpp
index 5da8abac2a9a26685ea6afe89c982e23e2487f03..7a62f428a4833854ac8092c6207cc3f17bb627bd 100644
--- a/src/xercesc/dom/impl/DOMNodeImpl.hpp
+++ b/src/xercesc/dom/impl/DOMNodeImpl.hpp
@@ -91,6 +91,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/dom/DOMUserDataHandler.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMNamedNodeMap;
class DOMNodeList;
class DOMNode;
@@ -410,4 +413,6 @@ public: // should really be protected - ALH
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMNodeIteratorImpl.cpp b/src/xercesc/dom/impl/DOMNodeIteratorImpl.cpp
index d861efdd100dd733d71003d79cf21a346e0dde36..cd2e8311b9da74398c64c7943c041c83a209e474 100644
--- a/src/xercesc/dom/impl/DOMNodeIteratorImpl.cpp
+++ b/src/xercesc/dom/impl/DOMNodeIteratorImpl.cpp
@@ -68,6 +68,9 @@
#include <xercesc/dom/DOMDocument.hpp>
#include <xercesc/dom/DOMException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
@@ -398,3 +401,5 @@ void DOMNodeIteratorImpl::release()
// chance that this is allocated again and again is not usual
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMNodeIteratorImpl.hpp b/src/xercesc/dom/impl/DOMNodeIteratorImpl.hpp
index 214d54379a54705b208e40397e7cacf379f2ff7b..255a8410fac2614ed6514f9a5fda0afb3eec542e 100644
--- a/src/xercesc/dom/impl/DOMNodeIteratorImpl.hpp
+++ b/src/xercesc/dom/impl/DOMNodeIteratorImpl.hpp
@@ -78,6 +78,7 @@
#include <xercesc/dom/DOMNode.hpp>
#include <xercesc/dom/DOMNodeIterator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class CDOM_EXPORT DOMNodeIteratorImpl : public DOMNodeIterator {
private:
@@ -154,4 +155,6 @@ class CDOM_EXPORT DOMNodeIteratorImpl : public DOMNodeIterator {
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMNodeListImpl.cpp b/src/xercesc/dom/impl/DOMNodeListImpl.cpp
index cfdeeb048e1fcc18170fbeece9a86e5bb4100d5b..a6a4865608b2e4a8fb8584bfbe9560c0d2be190f 100644
--- a/src/xercesc/dom/impl/DOMNodeListImpl.cpp
+++ b/src/xercesc/dom/impl/DOMNodeListImpl.cpp
@@ -63,6 +63,9 @@
#include "DOMNodeListImpl.hpp"
#include "DOMCasts.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
// revisit
// this implementation is too stupid - needs a cache of some kind.
//
@@ -105,4 +108,6 @@ DOMNode *DOMNodeListImpl::item(XMLSize_t index) const{
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMNodeListImpl.hpp b/src/xercesc/dom/impl/DOMNodeListImpl.hpp
index 4ab3dbfa3154a14b8e90ef0705376806cec840c1..69dfaad62b9a1c01f536ce2178e89e36add9059c 100644
--- a/src/xercesc/dom/impl/DOMNodeListImpl.hpp
+++ b/src/xercesc/dom/impl/DOMNodeListImpl.hpp
@@ -83,6 +83,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/dom/DOMNodeList.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMNode;
class CDOM_EXPORT DOMNodeListImpl: public DOMNodeList
@@ -102,6 +105,8 @@ public:
virtual XMLSize_t getLength() const;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMNodeVector.cpp b/src/xercesc/dom/impl/DOMNodeVector.cpp
index 0e4138eff18b3d96cfae99d841bee7fb87af1a41..50b5f4827f8986b439201f8565091f8db08fda54 100644
--- a/src/xercesc/dom/impl/DOMNodeVector.cpp
+++ b/src/xercesc/dom/impl/DOMNodeVector.cpp
@@ -71,6 +71,9 @@
#include "DOMDocumentImpl.hpp"
#include <assert.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
DOMNodeVector::DOMNodeVector(DOMDocument *doc)
{
init(doc, 10);
@@ -177,3 +180,5 @@ XMLSize_t DOMNodeVector::size() {
};
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMNodeVector.hpp b/src/xercesc/dom/impl/DOMNodeVector.hpp
index 482447bfba3bdc017ac0abc010553a34f08d36ea..c47839d58e141767b5b1e1481aa64f47cf7d1d11 100644
--- a/src/xercesc/dom/impl/DOMNodeVector.hpp
+++ b/src/xercesc/dom/impl/DOMNodeVector.hpp
@@ -70,6 +70,10 @@
//
#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMNode;
class DOMDocument;
@@ -97,4 +101,6 @@ public:
void reset();
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMNotationImpl.cpp b/src/xercesc/dom/impl/DOMNotationImpl.cpp
index 01504311edb2525126a7153724b4b11054f9cedc..51138f333db628567d429f91c5e38c0c9fc286b2 100644
--- a/src/xercesc/dom/impl/DOMNotationImpl.cpp
+++ b/src/xercesc/dom/impl/DOMNotationImpl.cpp
@@ -63,6 +63,7 @@
#include <xercesc/dom/DOMException.hpp>
#include <xercesc/dom/DOMNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
DOMNotationImpl::DOMNotationImpl(DOMDocument *ownerDoc, const XMLCh *nName)
@@ -214,4 +215,6 @@ const XMLCh* DOMNotationImpl::getBaseURI() const
DOMNode* DOMNotationImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMNotationImpl.hpp b/src/xercesc/dom/impl/DOMNotationImpl.hpp
index dab80a5ef8d40d532418f41b7563c310878ddc33..2840dfbf0c2b59f69ecb73f94c6201859077c07b 100644
--- a/src/xercesc/dom/impl/DOMNotationImpl.hpp
+++ b/src/xercesc/dom/impl/DOMNotationImpl.hpp
@@ -71,6 +71,10 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/dom/DOMNotation.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+
#include "DOMNodeImpl.hpp"
class DOMDocument;
@@ -117,4 +121,6 @@ public:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMParentNode.cpp b/src/xercesc/dom/impl/DOMParentNode.cpp
index 18b7a2631f294acedc37d45cbf5f6704e143233d..bd3999137ad945763396022c258ee0f8608b2a28 100644
--- a/src/xercesc/dom/impl/DOMParentNode.cpp
+++ b/src/xercesc/dom/impl/DOMParentNode.cpp
@@ -68,6 +68,8 @@
#include "DOMParentNode.hpp"
#include "DOMCasts.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
DOMParentNode::DOMParentNode(DOMDocument *ownerDoc)
: fOwnerDocument(ownerDoc), fChildNodeList(castToNode(this))
@@ -438,3 +440,5 @@ void DOMParentNode::release()
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMParentNode.hpp b/src/xercesc/dom/impl/DOMParentNode.hpp
index 3002e144984e182b5fb2c003323882093d0cccc6..d0320db2bee579f8c9a083a6859929df5d9eb479 100644
--- a/src/xercesc/dom/impl/DOMParentNode.hpp
+++ b/src/xercesc/dom/impl/DOMParentNode.hpp
@@ -85,6 +85,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include "DOMNodeListImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMChildNode;
class DOMDocument;
class DOMNode;
@@ -137,4 +140,6 @@ public:
void lastChild(DOMNode *);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMProcessingInstructionImpl.cpp b/src/xercesc/dom/impl/DOMProcessingInstructionImpl.cpp
index 16c38a087dca299ff412eba0851ba42d4a83c5ce..180ffbd4a2472610e275d67ce315dbc158c3a5ed 100644
--- a/src/xercesc/dom/impl/DOMProcessingInstructionImpl.cpp
+++ b/src/xercesc/dom/impl/DOMProcessingInstructionImpl.cpp
@@ -65,6 +65,9 @@
#include <xercesc/dom/DOMException.hpp>
#include <xercesc/dom/DOMNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
DOMProcessingInstructionImpl::DOMProcessingInstructionImpl(DOMDocument *ownerDoc,
const XMLCh *targt,
const XMLCh *dat)
@@ -226,3 +229,5 @@ const XMLCh* DOMProcessingInstructionImpl::getBaseURI() const
const XMLCh* DOMProcessingInstructionImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); };
DOMNode* DOMProcessingInstructionImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp b/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp
index 004c2c6b4786de43431192b939cd878e3bfad3df..7d746523f72418fd4d8680733efe030d47557ba5 100644
--- a/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp
+++ b/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp
@@ -75,6 +75,9 @@
#include "DOMNodeImpl.hpp"
#include "DOMChildNode.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DocumentImpl;
@@ -106,5 +109,7 @@ public:
virtual void setBaseURI(const XMLCh* baseURI);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMRangeImpl.cpp b/src/xercesc/dom/impl/DOMRangeImpl.cpp
index 1cc4147ca5996bf004c2fb7980f7110c87dee790..98ec68e555778e64acdf70141bade8fcf2a9c874 100644
--- a/src/xercesc/dom/impl/DOMRangeImpl.cpp
+++ b/src/xercesc/dom/impl/DOMRangeImpl.cpp
@@ -70,6 +70,9 @@
#include <xercesc/framework/XMLBuffer.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
//---------------------
// C'tor and D'tor
//---------------------
@@ -1830,3 +1833,5 @@ void DOMRangeImpl::updateSplitInfo(DOMText* oldNode, DOMText* startNode, XMLSize
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMRangeImpl.hpp b/src/xercesc/dom/impl/DOMRangeImpl.hpp
index d713965c25a8c676cbd851e947635a10944ccf13..fd75a15e9a7df6459b0b0db1bdbbef7d83be2e63 100644
--- a/src/xercesc/dom/impl/DOMRangeImpl.hpp
+++ b/src/xercesc/dom/impl/DOMRangeImpl.hpp
@@ -73,6 +73,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/dom/DOMRange.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMNode;
class DOMDocumentFragment;
@@ -198,4 +201,6 @@ private:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMStringPool.cpp b/src/xercesc/dom/impl/DOMStringPool.cpp
index e5ac23c3ab8c9a5239d2f0f4727cb4976ae32fbf..78807d999db38fd3f5f6871982cb58afdef1dd97 100644
--- a/src/xercesc/dom/impl/DOMStringPool.cpp
+++ b/src/xercesc/dom/impl/DOMStringPool.cpp
@@ -64,6 +64,9 @@
#include "DOMStringPool.hpp"
#include "DOMDocumentImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
//
// DStringPoolEntry - one of these structs is allocated for each
// XMLCh String in the pool. Each slot in the
@@ -220,3 +223,5 @@ void DOMBuffer::expandCapacity(const unsigned int extraNeeded)
fCapacity = newCap;
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMStringPool.hpp b/src/xercesc/dom/impl/DOMStringPool.hpp
index 3a91a84a96ba6401e814fa105eb31257524337c6..e245c07d2270cbc5e2eedc10ead534ce68797552 100644
--- a/src/xercesc/dom/impl/DOMStringPool.hpp
+++ b/src/xercesc/dom/impl/DOMStringPool.hpp
@@ -72,6 +72,9 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
struct DOMStringPoolEntry;
class DOMDocumentImpl;
@@ -198,4 +201,6 @@ private :
DOMDocumentImpl* fDoc;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMTextImpl.cpp b/src/xercesc/dom/impl/DOMTextImpl.cpp
index ef9d4d492efa6be9908ca0cdf41906a5ef25146f..c3fbc3f6691c44ffc230d3f43c1cb58104de5292 100644
--- a/src/xercesc/dom/impl/DOMTextImpl.cpp
+++ b/src/xercesc/dom/impl/DOMTextImpl.cpp
@@ -74,6 +74,9 @@
#include <assert.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class DOMDocument;
DOMTextImpl::DOMTextImpl(DOMDocument *ownerDoc, const XMLCh *dat)
@@ -256,3 +259,5 @@ void DOMTextImpl::release()
void DOMTextImpl::setData(const XMLCh *data) {fCharacterData.setData(this, data);};
void DOMTextImpl::setNodeValue(const XMLCh *nodeValue) {fCharacterData.setNodeValue (this, nodeValue); };
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMTextImpl.hpp b/src/xercesc/dom/impl/DOMTextImpl.hpp
index 1928972d735c73ac60661f3ed49fac1cd8241dbf..ce0ac5733c983eb6ded43c47c54ac6bff1693ed6 100644
--- a/src/xercesc/dom/impl/DOMTextImpl.hpp
+++ b/src/xercesc/dom/impl/DOMTextImpl.hpp
@@ -79,6 +79,9 @@
#include "DOMNodeImpl.hpp"
#include "DOMCharacterDataImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CDOM_EXPORT DOMTextImpl: public DOMText {
public:
DOMNodeImpl fNode;
@@ -122,5 +125,7 @@ protected:
friend class AbstractDOMParser;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMTreeWalkerImpl.cpp b/src/xercesc/dom/impl/DOMTreeWalkerImpl.cpp
index 1631f06772b7e64cc42f3584e81ca2adcda5b036..51015a031bce7cae18c5721c2dd268f5e1855656 100644
--- a/src/xercesc/dom/impl/DOMTreeWalkerImpl.cpp
+++ b/src/xercesc/dom/impl/DOMTreeWalkerImpl.cpp
@@ -64,6 +64,9 @@
#include <xercesc/dom/DOMDocument.hpp>
#include <xercesc/dom/DOMException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
/** constructor */
DOMTreeWalkerImpl::DOMTreeWalkerImpl (
DOMNode* root,
@@ -436,7 +439,7 @@ DOMNode* DOMTreeWalkerImpl::getFirstChild (DOMNode* node) {
return getFirstChild(newNode);
}
return getNextSibling(newNode);
-
+
}
@@ -502,3 +505,6 @@ void DOMTreeWalkerImpl::release()
// for performance reason, do not recycle pointer
// chance that this is allocated again and again is not usual
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMTreeWalkerImpl.hpp b/src/xercesc/dom/impl/DOMTreeWalkerImpl.hpp
index 534ccd53a3f12d62f95b5e01fae1d200d5ed48a4..17fb4a8e356ca0c42f52729e085f84f67e505251 100644
--- a/src/xercesc/dom/impl/DOMTreeWalkerImpl.hpp
+++ b/src/xercesc/dom/impl/DOMTreeWalkerImpl.hpp
@@ -72,6 +72,8 @@
#include <xercesc/dom/DOMTreeWalker.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class CDOM_EXPORT DOMTreeWalkerImpl : public DOMTreeWalker {
private:
@@ -200,4 +202,6 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/DOMWriterImpl.cpp b/src/xercesc/dom/impl/DOMWriterImpl.cpp
index 2b18610f18601511be17b430f1922a332e52d445..a0344b078e0bf56a5e70dfccb75654b1a56150ce 100644
--- a/src/xercesc/dom/impl/DOMWriterImpl.cpp
+++ b/src/xercesc/dom/impl/DOMWriterImpl.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.19 2002/11/04 15:07:35 tng
+ * C++ Namespace Support.
+ *
* Revision 1.18 2002/10/03 18:13:38 peiyongz
* Bug#12560 Use const in DOMWriter - patch from Duncan Stodart
* (Duncan_Stodart@insession.com )
@@ -128,6 +131,9 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
// ---------------------------------------------------------------------------
// Local const data
//
@@ -1338,3 +1344,5 @@ void DOMWriterImpl::release()
delete writer;
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/DOMWriterImpl.hpp b/src/xercesc/dom/impl/DOMWriterImpl.hpp
index 9629e650e3c4c3e2166edf208103d4393fbf7e73..f668a35dab7fc913c3f87c1ee3092f6eead734f3 100644
--- a/src/xercesc/dom/impl/DOMWriterImpl.hpp
+++ b/src/xercesc/dom/impl/DOMWriterImpl.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2002/11/04 15:07:35 tng
+ * C++ Namespace Support.
+ *
* Revision 1.7 2002/06/25 16:17:16 tng
* DOM L3: add release()
*
@@ -303,6 +306,9 @@
#include <xercesc/dom/DOM.hpp>
#include <xercesc/dom/DOMWriter.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CDOM_EXPORT DOMWriterImpl:public DOMWriter {
public:
@@ -452,4 +458,6 @@ inline void DOMWriterImpl::setURCharRef()
fFormatter->setUnRepFlags(XMLFormatter::UnRep_CharRef);
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/dom/impl/XSDElementNSImpl.cpp b/src/xercesc/dom/impl/XSDElementNSImpl.cpp
index 21a95fd303273272c6806af3f523a11220fbc8c2..1aa0a167b3e23880aab6fb83e92d619f3f8ed025 100644
--- a/src/xercesc/dom/impl/XSDElementNSImpl.cpp
+++ b/src/xercesc/dom/impl/XSDElementNSImpl.cpp
@@ -63,6 +63,9 @@
#include "DOMDocumentImpl.hpp"
#include "XSDElementNSImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
XSDElementNSImpl::XSDElementNSImpl(DOMDocument *ownerDoc, const XMLCh *nam) :
DOMElementNSImpl(ownerDoc, nam)
, fLineNo(0)
@@ -96,3 +99,5 @@ DOMNode * XSDElementNSImpl::cloneNode(bool deep) const {
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/impl/XSDElementNSImpl.hpp b/src/xercesc/dom/impl/XSDElementNSImpl.hpp
index 1987e18583e493c557b552d1e9ed9876f90be06d..779ff9e35808713d61bc8ad8c9f59b17926eb32b 100644
--- a/src/xercesc/dom/impl/XSDElementNSImpl.hpp
+++ b/src/xercesc/dom/impl/XSDElementNSImpl.hpp
@@ -74,6 +74,9 @@
#include "DOMElementNSImpl.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class CDOM_EXPORT XSDElementNSImpl: public DOMElementNSImpl {
protected:
@@ -96,4 +99,6 @@ public:
XMLSSize_t getColumnNo() const { return fColumnNo; }
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/LocalFileFormatTarget.cpp b/src/xercesc/framework/LocalFileFormatTarget.cpp
index 62814d02597fb68aa2e948215f3a7ff13bc5368a..cb28390855d1faf37a23cff761ed78c560d27e6e 100644
--- a/src/xercesc/framework/LocalFileFormatTarget.cpp
+++ b/src/xercesc/framework/LocalFileFormatTarget.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.1 2002/06/19 21:59:26 peiyongz
* DOM3:DOMSave Interface support: LocalFileFormatTarget
*
@@ -66,6 +69,8 @@
#include <xercesc/framework/LocalFileFormatTarget.hpp>
#include <xercesc/util/PlatformUtils.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
LocalFileFormatTarget::LocalFileFormatTarget(const XMLCh* const fileName)
:fSource(0)
{
@@ -96,4 +101,6 @@ void LocalFileFormatTarget::writeChars(const XMLByte* const toWrite
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/framework/LocalFileFormatTarget.hpp b/src/xercesc/framework/LocalFileFormatTarget.hpp
index 87e89c9f2023234073470b2f75dd74a7b0a65392..9f1056ba9e5cb0fab441fdadacfad389ac6e0da4 100644
--- a/src/xercesc/framework/LocalFileFormatTarget.hpp
+++ b/src/xercesc/framework/LocalFileFormatTarget.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.1 2002/06/19 21:59:26 peiyongz
* DOM3:DOMSave Interface support: LocalFileFormatTarget
*
@@ -68,6 +71,8 @@
#include <xercesc/framework/XMLFormatter.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLPARSER_EXPORT LocalFileFormatTarget : public XMLFormatTarget {
public:
@@ -105,5 +110,8 @@ private:
};
+
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/LocalFileInputSource.cpp b/src/xercesc/framework/LocalFileInputSource.cpp
index 7bb2f55c9e5cab91324015ea6f9f6f0a5b685582..63e26a321987a48b92d1b6efbd0c26026497f168 100644
--- a/src/xercesc/framework/LocalFileInputSource.cpp
+++ b/src/xercesc/framework/LocalFileInputSource.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -62,6 +62,7 @@
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/framework/LocalFileInputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// LocalFileInputSource: Constructors and Destructor
@@ -123,3 +124,6 @@ BinInputStream* LocalFileInputSource::makeStream() const
}
return retStrm;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/framework/LocalFileInputSource.hpp b/src/xercesc/framework/LocalFileInputSource.hpp
index 77bb2f286b61cc3b69c9b8de7dec75607ae82fb0..156e22009b9b5344f2507c126b7c8c288378a5e9 100644
--- a/src/xercesc/framework/LocalFileInputSource.hpp
+++ b/src/xercesc/framework/LocalFileInputSource.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:50 peiyongz
+ * sane_include
*
* Revision 1.7 2001/10/13 04:21:53 jasons
* This patch resolves bug #2409: undocumented XMLException in LocalFileInputSource::new()
@@ -98,6 +101,8 @@
#include <xercesc/sax/InputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class BinInputStream;
/**
@@ -202,4 +207,6 @@ public :
//@}
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/MemBufFormatTarget.cpp b/src/xercesc/framework/MemBufFormatTarget.cpp
index 863267350bf97af2c34ac9a0f1c29e850afeffc7..3ebb2462b37cb69a5052c45510c32dd6c58c0b1a 100644
--- a/src/xercesc/framework/MemBufFormatTarget.cpp
+++ b/src/xercesc/framework/MemBufFormatTarget.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.5 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/08/12 21:38:22 peiyongz
* Bug#11462: MemBufFormatTarget issue(2) .., proposed patch from
* Esmond Pitt (pitte@anz.com)
@@ -76,6 +79,8 @@
#include <xercesc/util/XMLString.hpp>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
MemBufFormatTarget::MemBufFormatTarget(int initCapacity)
: fDataBuf(0)
, fIndex(0)
@@ -146,3 +151,5 @@ void MemBufFormatTarget::insureCapacity(const unsigned int extraNeeded)
fCapacity = newCap;
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/framework/MemBufFormatTarget.hpp b/src/xercesc/framework/MemBufFormatTarget.hpp
index b2e608d0d24c4d3cf91b36eb645dd6211f0de5a2..e402048b6159ef95e003cd943549bd7c1b9438d8 100644
--- a/src/xercesc/framework/MemBufFormatTarget.hpp
+++ b/src/xercesc/framework/MemBufFormatTarget.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.5 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/08/12 21:38:22 peiyongz
* Bug#11462: MemBufFormatTarget issue(2) .., proposed patch from
* Esmond Pitt (pitte@anz.com)
@@ -77,7 +80,8 @@
#include <xercesc/framework/XMLFormatter.hpp>
-
+XERCES_CPP_NAMESPACE_BEGIN
+
/*
* The MemBufFormatTarget is a derivative from XMLFormatTarget, which user code
* may plug into DOMWriter to retrieve the serialized XML stream (from DOM Tree)
@@ -86,11 +90,11 @@
* The MemBufFormatTarget is initalized to have a memory buffer of 1023 upon
* construction, which grows as needed. The buffer will be deleted when
* MemBufFormatTarget is destructed; or will be reset when the reset() function
- * is called.
+ * is called.
*
* The MemBufFormatTarget returns a NULL terminated XMLByte stream upon request,
- * through the method getRawBuffer(), and user should make its own copy of the
- * returned buffer if it intends to keep it independent on the state of the
+ * through the method getRawBuffer(), and user should make its own copy of the
+ * returned buffer if it intends to keep it independent on the state of the
* MemBufFormatTarget.
*/
@@ -177,5 +181,7 @@ private:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/MemBufInputSource.cpp b/src/xercesc/framework/MemBufInputSource.cpp
index d652645e1618dabbad68847778b81476b958b8dd..92b9f1b35d0e11f33e021eba5b04c7c7a7480a6c 100644
--- a/src/xercesc/framework/MemBufInputSource.cpp
+++ b/src/xercesc/framework/MemBufInputSource.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:21:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:50 peiyongz
+ * sane_include
*
* Revision 1.2 2000/02/06 07:47:46 rahulj
* Year 2K copyright swat.
@@ -81,6 +84,7 @@
#include <xercesc/util/BinMemInputStream.hpp>
#include <xercesc/framework/MemBufInputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// MemBufInputSource: Constructors and Destructor
@@ -134,3 +138,6 @@ BinInputStream* MemBufInputSource::makeStream() const
: BinMemInputStream::BufOpt_Reference
);
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/framework/MemBufInputSource.hpp b/src/xercesc/framework/MemBufInputSource.hpp
index be147241a8559177945346631be62d4e281e1bf3..7893c8f3c7a4449ce5521282ecc48398c08f95f5 100644
--- a/src/xercesc/framework/MemBufInputSource.hpp
+++ b/src/xercesc/framework/MemBufInputSource.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/20 18:17:01 tng
* [Bug 5977] Warnings on generating apiDocs.
*
@@ -95,6 +98,8 @@
#include <xercesc/sax/InputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class BinInputStream;
@@ -271,4 +276,6 @@ inline void MemBufInputSource::setCopyBufToStream(const bool newState)
fCopyBufToStream = newState;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/StdInInputSource.cpp b/src/xercesc/framework/StdInInputSource.cpp
index d4ec1b2e4b115d2e539c25fde504e96801d6d7d7..58f2b3a3d80ecf8d7033d499e48c87af3de273dd 100644
--- a/src/xercesc/framework/StdInInputSource.cpp
+++ b/src/xercesc/framework/StdInInputSource.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:21:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:50 peiyongz
+ * sane_include
*
* Revision 1.2 2000/02/06 07:47:46 rahulj
* Year 2K copyright swat.
@@ -82,6 +85,7 @@
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/framework/StdInInputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// StdInInputSource: Implementation of the input source interface
@@ -101,3 +105,6 @@ BinInputStream* StdInInputSource::makeStream() const
}
return retStream;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/framework/StdInInputSource.hpp b/src/xercesc/framework/StdInInputSource.hpp
index bc5029dd7afb217ac5ec16d985c23120f36f0b81..f288e70b3e77366396acd832e62a4c3de5228172 100644
--- a/src/xercesc/framework/StdInInputSource.hpp
+++ b/src/xercesc/framework/StdInInputSource.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:50 peiyongz
+ * sane_include
*
* Revision 1.6 2000/12/14 18:49:55 tng
* Fix API document generation warning: "Warning: end of member group without matching begin"
@@ -92,6 +95,8 @@
#include <xercesc/sax/InputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class BinInputStream;
@@ -160,4 +165,6 @@ inline StdInInputSource::~StdInInputSource()
{
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/StdOutFormatTarget.cpp b/src/xercesc/framework/StdOutFormatTarget.cpp
index b2963bdf2db3965ec8434b67f2615c2e64317c63..7f95d299c4524fdd403e8b776fb9c97c6589d867 100644
--- a/src/xercesc/framework/StdOutFormatTarget.cpp
+++ b/src/xercesc/framework/StdOutFormatTarget.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.1 2002/05/28 22:40:46 peiyongz
* DOM3 Save Interface: DOMWriter/DOMWriterFilter
*
@@ -65,6 +68,8 @@
#include <xercesc/framework/StdOutFormatTarget.hpp>
#include <iostream.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
StdOutFormatTarget::StdOutFormatTarget()
{}
@@ -73,7 +78,7 @@ StdOutFormatTarget::~StdOutFormatTarget()
void StdOutFormatTarget::writeChars(const XMLByte* const toWrite
, const unsigned int count
- , XMLFormatter* const formatter)
+ , XMLFormatter* const formatter)
{
// Surprisingly, Solaris was the only platform on which
// required the char* cast to print out the string correctly.
@@ -84,5 +89,5 @@ void StdOutFormatTarget::writeChars(const XMLByte* const toWrite
}
-
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/framework/StdOutFormatTarget.hpp b/src/xercesc/framework/StdOutFormatTarget.hpp
index 311795d23356f8b32db754e175c48c955b425d53..0729f98efcdf9d59581aba16c6e0c1d0fdcea4e1 100644
--- a/src/xercesc/framework/StdOutFormatTarget.hpp
+++ b/src/xercesc/framework/StdOutFormatTarget.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/06/05 15:47:29 peiyongz
* operator = modified
*
@@ -70,6 +73,8 @@
#include <xercesc/framework/XMLFormatter.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLPARSER_EXPORT StdOutFormatTarget : public XMLFormatTarget {
public:
@@ -94,4 +99,6 @@ private:
StdOutFormatTarget& operator=(const StdOutFormatTarget&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/URLInputSource.cpp b/src/xercesc/framework/URLInputSource.cpp
index f1479f0bab6084a3c70864046028ee3475792acf..2bc482c8f084e5ac3c4b325b7dc8b8811554f9c3 100644
--- a/src/xercesc/framework/URLInputSource.cpp
+++ b/src/xercesc/framework/URLInputSource.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/04/25 00:12:34 jasons
* fairly serious error in the two XMLCh* constructor, the fURL member
* was being improperly initialized with the (systemID,publicID) instead
@@ -95,6 +98,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/framework/URLInputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// URLInputSource: Constructors and Destructor
@@ -108,7 +112,7 @@ URLInputSource::URLInputSource(const XMLURL& urlId) :
URLInputSource::URLInputSource( const XMLCh* const baseId
, const XMLCh* const systemId) :
- fURL(baseId, systemId)
+ fURL(baseId, systemId)
{
// Create a URL that will build up the full URL and store as the system id
setSystemId(fURL.getURLText());
@@ -152,3 +156,6 @@ BinInputStream* URLInputSource::makeStream() const
// Ask the URL to create us an appropriate input stream
return fURL.makeNewStream();
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/framework/URLInputSource.hpp b/src/xercesc/framework/URLInputSource.hpp
index 6a5208c8d2fedefde9cb34e41d4938865cf6c181..b64d5a43ea052952d44edd6243a523a4abc6e5c0 100644
--- a/src/xercesc/framework/URLInputSource.hpp
+++ b/src/xercesc/framework/URLInputSource.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:50 peiyongz
+ * sane_include
*
* Revision 1.8 2000/12/14 18:49:56 tng
* Fix API document generation warning: "Warning: end of member group without matching begin"
@@ -103,6 +106,8 @@
#include <xercesc/util/XMLURL.hpp>
#include <xercesc/sax/InputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class BinInputStream;
/**
@@ -280,4 +285,6 @@ inline const XMLURL& URLInputSource::urlSrc() const
return fURL;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/Wrapper4DOMInputSource.cpp b/src/xercesc/framework/Wrapper4DOMInputSource.cpp
index b40caf2d077602a09e311e35feff3590e6c712ea..cf3ec54f92d1f03c7fe0462ecced4060a25c8e0f 100644
--- a/src/xercesc/framework/Wrapper4DOMInputSource.cpp
+++ b/src/xercesc/framework/Wrapper4DOMInputSource.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/07/19 14:57:28 knoaman
* Add an adoptFlag parameter to the constructor and remove the setter method.
* Documentation update.
@@ -73,6 +76,7 @@
#include <xercesc/dom/DOMInputSource.hpp>
#include <xercesc/util/NullPointerException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Wrapper4DOMInputSource: Constructor and Destructor
@@ -152,4 +156,5 @@ BinInputStream* Wrapper4DOMInputSource::makeStream() const
return fInputSource->makeStream();
}
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/framework/Wrapper4DOMInputSource.hpp b/src/xercesc/framework/Wrapper4DOMInputSource.hpp
index d8631762af0e52ab390d401b1fc53e7de7a35314..9977dd2981c16a39f95f1f7b3db9d0b2a422b93f 100644
--- a/src/xercesc/framework/Wrapper4DOMInputSource.hpp
+++ b/src/xercesc/framework/Wrapper4DOMInputSource.hpp
@@ -64,6 +64,8 @@
#include <xercesc/sax/InputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class DOMInputSource;
@@ -78,11 +80,11 @@ public:
/**
* Constructor
- *
+ *
* Wrap a DOMInputSource and pretend it to be a SAX InputSource.
* By default, the wrapper will adopt the DOMInputSource that is wrapped.
*
- * @param inputSource The DOMInputSource to be wrapped
+ * @param inputSource The DOMInputSource to be wrapped
* @param adoptFlag Indicates if the wrapper should adopt the wrapped
* DOMInputSource. Default is true.
*/
@@ -105,7 +107,7 @@ public:
*
* Makes the byte stream for this input source.
*
- * <p>The function will call the makeStream of the wrapped input source.
+ * <p>The function will call the makeStream of the wrapped input source.
* The returned stream becomes the parser's property.</p>
*
* @see BinInputStream
@@ -261,5 +263,7 @@ private:
DOMInputSource* fInputSource;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/Wrapper4InputSource.cpp b/src/xercesc/framework/Wrapper4InputSource.cpp
index e21decb274481f601c1d5591e98c010ac27372eb..323f55187249d33530086b363c2af5c4c088147c 100644
--- a/src/xercesc/framework/Wrapper4InputSource.cpp
+++ b/src/xercesc/framework/Wrapper4InputSource.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/07/19 14:57:28 knoaman
* Add an adoptFlag parameter to the constructor and remove the setter method.
* Documentation update.
@@ -76,6 +79,7 @@
#include <xercesc/sax/InputSource.hpp>
#include <xercesc/util/NullPointerException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Wrapper4InputSource: Constructor and Destructor
@@ -164,3 +168,5 @@ void Wrapper4InputSource::release()
delete src;
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/framework/Wrapper4InputSource.hpp b/src/xercesc/framework/Wrapper4InputSource.hpp
index 0ee49d4368fdb4edb5ad666a57bf0d23c3176d66..4316372674e22e7d471d57818d5f440bd2e5f0bb 100644
--- a/src/xercesc/framework/Wrapper4InputSource.hpp
+++ b/src/xercesc/framework/Wrapper4InputSource.hpp
@@ -64,6 +64,8 @@
#include <xercesc/dom/DOMInputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class InputSource;
@@ -78,11 +80,11 @@ public:
/**
* Constructor
- *
+ *
* Wrap a SAX InputSource and pretend it to be a DOMInputSource.
* By default, the wrapper will adopt the SAX InputSource that is wrapped.
*
- * @param inputSource The SAX InputSource to be wrapped
+ * @param inputSource The SAX InputSource to be wrapped
* @param adoptFlag Indicates if the wrapper should adopt the wrapped
* SAX InputSource. Default is true.
*/
@@ -105,7 +107,7 @@ public:
*
* Makes the byte stream for this input source.
*
- * <p>The function will call the makeStream of the wrapped input source.
+ * <p>The function will call the makeStream of the wrapped input source.
* The returned stream becomes the parser's property.</p>
*
* @see BinInputStream
@@ -313,4 +315,6 @@ inline void Wrapper4InputSource::setBaseURI(const XMLCh* const)
{
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/XMLAttDef.cpp b/src/xercesc/framework/XMLAttDef.cpp
index ed3e74bba075b95f0a7018d8dcfba7a4333df12b..9b1298314fe14f698c3c79cdf3fc9614c6351345 100644
--- a/src/xercesc/framework/XMLAttDef.cpp
+++ b/src/xercesc/framework/XMLAttDef.cpp
@@ -67,6 +67,7 @@
#include <xercesc/util/XMLUni.hpp>
#include <xercesc/framework/XMLAttDef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local const data
@@ -200,3 +201,6 @@ void XMLAttDef::cleanUp()
delete [] fEnumeration;
delete [] fValue;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/framework/XMLAttDef.hpp b/src/xercesc/framework/XMLAttDef.hpp
index f09d07f833749c414f37176e517fba84c14a5b8f..2d6f32c4f762adfe97688d8510264cd0c25c8803 100644
--- a/src/xercesc/framework/XMLAttDef.hpp
+++ b/src/xercesc/framework/XMLAttDef.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/20 18:17:01 tng
* [Bug 5977] Warnings on generating apiDocs.
*
@@ -112,6 +115,8 @@
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLAttr;
/** Represents the core information of an atribute definition
@@ -633,4 +638,6 @@ inline void XMLAttDef::setExternalAttDeclaration(const bool aValue)
fExternalAttribute = aValue;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/XMLAttDefList.hpp b/src/xercesc/framework/XMLAttDefList.hpp
index 12f2c6f44168eafff5b8d35ec082bb2c60b14069..449815ed33ab78bfb1a3c8a9084c625a08fa89f7 100644
--- a/src/xercesc/framework/XMLAttDefList.hpp
+++ b/src/xercesc/framework/XMLAttDefList.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:50 peiyongz
+ * sane_include
*
* Revision 1.4 2000/02/24 20:00:22 abagchi
* Swat for removing Log from API docs
@@ -83,6 +86,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/framework/XMLAttDef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
/**
* This class defines an abstract interface that all validators must support.
@@ -176,4 +180,6 @@ inline XMLAttDefList& XMLAttDefList::operator=(const XMLAttDefList&)
return *this;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/XMLAttr.cpp b/src/xercesc/framework/XMLAttr.cpp
index f0303d532ab25136a9d9e3c3e17afc6922d35bd7..653de008b35bcf25ae0253c05cfe28271bc7b26f 100644
--- a/src/xercesc/framework/XMLAttr.cpp
+++ b/src/xercesc/framework/XMLAttr.cpp
@@ -67,7 +67,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/framework/XMLAttr.hpp>
-
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLAttr: Constructors and Destructor
@@ -158,3 +158,6 @@ void XMLAttr::cleanUp()
delete fAttName;
delete [] fValue;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/framework/XMLAttr.hpp b/src/xercesc/framework/XMLAttr.hpp
index 4925bafc829d435864df81a22230b94be5bb41d3..4e596b88bd56d9a68257e09c5bfe515f50ba1c4c 100644
--- a/src/xercesc/framework/XMLAttr.hpp
+++ b/src/xercesc/framework/XMLAttr.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/20 18:17:01 tng
* [Bug 5977] Warnings on generating apiDocs.
*
@@ -104,6 +107,7 @@
#include <xercesc/util/QName.hpp>
#include <xercesc/framework/XMLAttDef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
/**
* This class defines the information about an attribute that will come out
@@ -462,4 +466,6 @@ inline void XMLAttr::setSpecified(const bool newValue)
fSpecified = newValue;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/XMLBuffer.cpp b/src/xercesc/framework/XMLBuffer.cpp
index 982fc753680e072ee5d897ea81c388f3d9fa377c..e8272a52b5a04da92063f577ee09f1381b0633dc 100644
--- a/src/xercesc/framework/XMLBuffer.cpp
+++ b/src/xercesc/framework/XMLBuffer.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/13 17:07:43 peiyongz
* using 2 instead of 1.25 to expand capacity
*
@@ -93,6 +96,7 @@
#include <xercesc/framework/XMLBuffer.hpp>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLBuffer: Buffer management
@@ -156,3 +160,6 @@ void XMLBuffer::insureCapacity(const unsigned int extraNeeded)
fBuffer = newBuf;
fCapacity = newCap;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/framework/XMLBuffer.hpp b/src/xercesc/framework/XMLBuffer.hpp
index 3d3ce8f2efb06c13e8cec528ae1d96f57555863e..3c170dff9b42220581e233edf7d79baee335bd0d 100644
--- a/src/xercesc/framework/XMLBuffer.hpp
+++ b/src/xercesc/framework/XMLBuffer.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/21 18:54:52 tng
* [Bug 11869] Add the const modifier (XMLBuffer.hpp).
*
@@ -93,6 +96,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* XMLBuffer is a lightweight, expandable Unicode text buffer. Since XML is
* inherently theoretically unbounded in terms of the sizes of things, we
@@ -244,4 +249,6 @@ private :
bool fUsed;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/XMLBufferMgr.cpp b/src/xercesc/framework/XMLBufferMgr.cpp
index 954242f0fbf8d25dba8aaceeeb5db528d0158369..39f68ae8ecf73030ff3fd1387e69cbf37a482e63 100644
--- a/src/xercesc/framework/XMLBufferMgr.cpp
+++ b/src/xercesc/framework/XMLBufferMgr.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:21:51 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:51 peiyongz
+ * sane_include
*
* Revision 1.4 2000/05/15 22:31:11 andyh
* Replace #include<memory.h> with <string.h> everywhere.
@@ -87,7 +90,7 @@
#include <xercesc/framework/XMLBuffer.hpp>
#include <xercesc/framework/XMLBufferMgr.hpp>
-
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Constructors and Destructor
@@ -169,3 +172,6 @@ void XMLBufferMgr::releaseBuffer(XMLBuffer& toRelease)
// It was not a legal buffer
ThrowXML(RuntimeException, XMLExcepts::BufMgr_BufferNotInPool);
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/framework/XMLBufferMgr.hpp b/src/xercesc/framework/XMLBufferMgr.hpp
index 51bf40cacf9b3cacc87ad849534f4743ac255ee2..76f38df9e1febfe49b6cba43f30ce7c307b77ee2 100644
--- a/src/xercesc/framework/XMLBufferMgr.hpp
+++ b/src/xercesc/framework/XMLBufferMgr.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/21 18:54:52 tng
* [Bug 11869] Add the const modifier (XMLBuffer.hpp).
*
@@ -91,6 +94,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/framework/XMLBuffer.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLBufBid;
/**
@@ -238,4 +243,6 @@ private :
XMLBufferMgr* const fMgr;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/XMLContentModel.cpp b/src/xercesc/framework/XMLContentModel.cpp
index 28a4befb02d944d02edd115ff85c1f1e3db4d0f8..a3252a16342e557a02787edb266f895992c1ea01 100644
--- a/src/xercesc/framework/XMLContentModel.cpp
+++ b/src/xercesc/framework/XMLContentModel.cpp
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:21:51 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:51 peiyongz
+ * sane_include
*
* Revision 1.3 2001/05/28 20:53:35 tng
* Schema: move static data gInvalidTrans, gEOCFakeId, gEpsilonFakeId to XMLContentModel for others to access
@@ -79,6 +82,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/framework/XMLContentModel.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// public static data
// ---------------------------------------------------------------------------
@@ -86,3 +91,5 @@ const unsigned int XMLContentModel::gInvalidTrans = 0xFFFFFFFF;
const unsigned int XMLContentModel::gEOCFakeId = 0xFFFFFFF1;
const unsigned int XMLContentModel::gEpsilonFakeId = 0xFFFFFFF2;
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/framework/XMLContentModel.hpp b/src/xercesc/framework/XMLContentModel.hpp
index 57c3d3c225116b2df57a6491e446e500c20f2b21..a4af012aee7b8692cccdb0365ec859fcb481dd78 100644
--- a/src/xercesc/framework/XMLContentModel.hpp
+++ b/src/xercesc/framework/XMLContentModel.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:51 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:51 peiyongz
+ * sane_include
*
* Revision 1.14 2001/11/21 14:30:13 knoaman
* Fix for UPA checking.
@@ -116,6 +119,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/QName.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentLeafNameTypeVector;
class GrammarResolver;
class XMLStringPool;
@@ -215,4 +220,6 @@ private :
void operator=(const XMLContentModel&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/XMLDocumentHandler.hpp b/src/xercesc/framework/XMLDocumentHandler.hpp
index 9bcdda71fef7e496ca94dd6cf7673a70a352c136..e1c5daf831761fa07b527631f4ac98506dd0517a 100644
--- a/src/xercesc/framework/XMLDocumentHandler.hpp
+++ b/src/xercesc/framework/XMLDocumentHandler.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/05/28 20:41:11 tng
* [Bug 9104] prefixes dissapearing when schema validation turned on.
*
@@ -104,6 +107,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/framework/XMLAttr.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLElementDecl;
class XMLEntityDecl;
@@ -353,4 +358,6 @@ private:
void operator=(const XMLDocumentHandler&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/XMLElementDecl.cpp b/src/xercesc/framework/XMLElementDecl.cpp
index 080909b49396a1315b03c8ff7e076f9762bd3cdf..9e6ab8a522282ae02fc40ecf36c38be4bd7fdd33 100644
--- a/src/xercesc/framework/XMLElementDecl.cpp
+++ b/src/xercesc/framework/XMLElementDecl.cpp
@@ -66,6 +66,8 @@
#include <xercesc/util/XMLUni.hpp>
#include <xercesc/framework/XMLElementDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// XMLElementDecl: Public, static data
// ---------------------------------------------------------------------------
@@ -125,3 +127,6 @@ XMLElementDecl::XMLElementDecl() :
, fExternalElement (false)
{
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/framework/XMLElementDecl.hpp b/src/xercesc/framework/XMLElementDecl.hpp
index 844a99b3c5725995248d4772d4161f675868eefc..ef4e0ec4d95a9945ff6bddf14a9f42b53d125480 100644
--- a/src/xercesc/framework/XMLElementDecl.hpp
+++ b/src/xercesc/framework/XMLElementDecl.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/20 16:55:33 tng
* [Bug 6251] Info during compilation.
*
@@ -131,6 +134,8 @@
#include <xercesc/framework/XMLAttr.hpp>
#include <xercesc/framework/XMLAttDefList.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentSpecNode;
class XMLContentModel;
@@ -668,4 +673,6 @@ inline void XMLElementDecl::setExternalElemDeclaration(const bool aValue)
fExternalElement = aValue;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/XMLEntityDecl.cpp b/src/xercesc/framework/XMLEntityDecl.cpp
index 162999547510c145600c242e9e43ea42d526ad69..49afc97ae356f5cbf118ac1d65dd3890678e66b2 100644
--- a/src/xercesc/framework/XMLEntityDecl.cpp
+++ b/src/xercesc/framework/XMLEntityDecl.cpp
@@ -67,6 +67,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/framework/XMLEntityDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLEntityDecl: Constructors and Destructor
@@ -174,3 +175,6 @@ void XMLEntityDecl::cleanUp()
delete [] fSystemId;
delete [] fBaseURI;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/framework/XMLEntityDecl.hpp b/src/xercesc/framework/XMLEntityDecl.hpp
index ed87aaff3f5e38cd61fa87f20c22916aa77229f4..a72f3df6e67d0e8142256e4c85ad89aaf4f7cace 100644
--- a/src/xercesc/framework/XMLEntityDecl.hpp
+++ b/src/xercesc/framework/XMLEntityDecl.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/22 19:27:41 tng
* [Bug 11448] DomCount has problems with XHTML1.1 DTD.
*
@@ -90,6 +93,8 @@
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* This class defines that core information that defines an XML entity, no
* matter what validator is used. Each validator will create a derivative
@@ -519,4 +524,6 @@ inline const XMLCh* XMLEntityDecl::getKey() const
return fName;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/XMLEntityHandler.hpp b/src/xercesc/framework/XMLEntityHandler.hpp
index 7c6f9aeb400084f3ea377562f1ef03b7c05c06d2..09f18248e0557cac1cbac8089f713821bc92bc98 100644
--- a/src/xercesc/framework/XMLEntityHandler.hpp
+++ b/src/xercesc/framework/XMLEntityHandler.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/06/06 20:41:51 tng
* Regression fix: should assign the returned InputSource from resolveEntity to srcToFill.
*
@@ -103,6 +106,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class InputSource;
class XMLBuffer;
@@ -233,4 +238,6 @@ private:
void operator=(const XMLEntityHandler&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/XMLErrorCodes.hpp b/src/xercesc/framework/XMLErrorCodes.hpp
index 71afc9f3b6a04f1b9120ed162453cb81796aedfc..9ddc933d557791ca125e1e00ea68834fa3571abc 100644
--- a/src/xercesc/framework/XMLErrorCodes.hpp
+++ b/src/xercesc/framework/XMLErrorCodes.hpp
@@ -4,6 +4,9 @@
#define ERRHEADER_XMLErrs
#include <xercesc/framework/XMLErrorReporter.hpp>
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
class XMLErrs
{
@@ -329,5 +332,8 @@ public :
return XMLErrorReporter::ErrTypes_Unknown;
}
};
+
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/XMLErrorReporter.hpp b/src/xercesc/framework/XMLErrorReporter.hpp
index e02e7bbaf2e0b0f6d5b94ee5f6a29ef60e45bad2..8d6441dbb687310637a767781c03e5e5630f6734 100644
--- a/src/xercesc/framework/XMLErrorReporter.hpp
+++ b/src/xercesc/framework/XMLErrorReporter.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/05/27 18:34:59 tng
* To get ready for 64 bit large file, use XMLSSize_t to represent line and column number.
*
@@ -114,6 +117,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLMsgLoader.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* This abstract class defines a callback mechanism for the scanner. By
@@ -245,4 +250,6 @@ private:
void operator=(const XMLErrorReporter&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/XMLFormatter.cpp b/src/xercesc/framework/XMLFormatter.cpp
index ea9e7e5482524218554e94ec9abb5bfb300894f1..e6c9431a2a04f88d7cb86aa5a4161311a4836b35 100644
--- a/src/xercesc/framework/XMLFormatter.cpp
+++ b/src/xercesc/framework/XMLFormatter.cpp
@@ -71,6 +71,7 @@
#include <xercesc/framework/XMLFormatter.hpp>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local data
@@ -364,7 +365,7 @@ XMLFormatter::formatBuf(const XMLCh* const toFormat
const unsigned srcChars = srcCount > kTmpBufSize ?
kTmpBufSize : srcCount;
-
+
const unsigned int outBytes = fXCoder->transcodeTo
(
srcPtr
@@ -679,3 +680,5 @@ void XMLFormatter::specialFormat(const XMLCh* const toFormat
}
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/framework/XMLFormatter.hpp b/src/xercesc/framework/XMLFormatter.hpp
index 27c84c9707453f997563061d2c45ee8859de6395..a812429bf2c28b511df4199331e9fa663f3d0906 100644
--- a/src/xercesc/framework/XMLFormatter.hpp
+++ b/src/xercesc/framework/XMLFormatter.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/07/30 16:29:16 tng
* [Bug 8550] No explanation of XMLFormatter escape options.
*
@@ -102,6 +105,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLFormatTarget;
class XMLTranscoder;
@@ -519,5 +524,6 @@ inline XMLFormatter& XMLFormatter::operator<<(const UnRepFlags newFlags)
return *this;
}
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/framework/XMLNotationDecl.cpp b/src/xercesc/framework/XMLNotationDecl.cpp
index 9654867c4d15d979f6838ff68bf0b9eb63841b79..41114093ee00729196560b2d353baf7014564375 100644
--- a/src/xercesc/framework/XMLNotationDecl.cpp
+++ b/src/xercesc/framework/XMLNotationDecl.cpp
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/22 19:27:41 tng
* [Bug 11448] DomCount has problems with XHTML1.1 DTD.
*
@@ -79,6 +82,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/framework/XMLNotationDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLNotationDecl: Constructors and operators
@@ -144,3 +148,5 @@ void XMLNotationDecl::cleanUp()
delete [] fSystemId;
delete [] fBaseURI;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/framework/XMLNotationDecl.hpp b/src/xercesc/framework/XMLNotationDecl.hpp
index 65330792542f3198f65bf0b5dc860d68e6a4cba2..78e783fc51329003d735dce09be0faad38a97dd7 100644
--- a/src/xercesc/framework/XMLNotationDecl.hpp
+++ b/src/xercesc/framework/XMLNotationDecl.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/22 19:27:41 tng
* [Bug 11448] DomCount has problems with XHTML1.1 DTD.
*
@@ -90,6 +93,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* This class represents the core information about a notation declaration
* that all validators must at least support. Each validator will create a
@@ -258,4 +263,6 @@ inline const XMLCh* XMLNotationDecl::getKey() const
return fName;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/XMLPScanToken.hpp b/src/xercesc/framework/XMLPScanToken.hpp
index fdcb8060ef7d9b8a1aa70de5b895e99fe9df1223..9b0a16cccd98a8eaa620e90f454a42984798d260 100644
--- a/src/xercesc/framework/XMLPScanToken.hpp
+++ b/src/xercesc/framework/XMLPScanToken.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:52 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:52 peiyongz
+ * sane_include
*
* Revision 1.4 2000/02/24 20:00:23 abagchi
* Swat for removing Log from API docs
@@ -80,6 +83,10 @@
#if !defined(XMLPSCANTOKEN_HPP)
#define XMLPSCANTOKEN_HPP
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLScanner;
/**
@@ -200,4 +207,6 @@ inline void XMLPScanToken::set( const XMLUInt32 scannerId
fSequenceId = sequenceId;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/XMLRecognizer.cpp b/src/xercesc/framework/XMLRecognizer.cpp
index d3cc091f0461865514fe29b5c9c345bbc19199c4..3d9da5c9df321e2f2713a22eac7efe5526ff91be 100644
--- a/src/xercesc/framework/XMLRecognizer.cpp
+++ b/src/xercesc/framework/XMLRecognizer.cpp
@@ -68,6 +68,7 @@
#include <xercesc/framework/XMLRecognizer.hpp>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local data
@@ -260,3 +261,5 @@ XMLRecognizer::nameForEncoding(const XMLRecognizer::Encodings theEncoding)
return gEncodingNameMap[theEncoding];
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/framework/XMLRecognizer.hpp b/src/xercesc/framework/XMLRecognizer.hpp
index 4c1d535a2ab19a80b684bb5b98e129e51cdf12f2..3918671af359b76db1979e5ef69bbba7146b72b0 100644
--- a/src/xercesc/framework/XMLRecognizer.hpp
+++ b/src/xercesc/framework/XMLRecognizer.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -61,6 +61,10 @@
#if !defined(XMLRECOGNIZER_HPP)
#define XMLRECOGNIZER_HPP
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* This class provides some simple code to recognize the encodings of
* XML files. This recognition only does very basic sensing of the encoding
@@ -169,4 +173,6 @@ protected :
void operator=(const XMLRecognizer&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/framework/XMLRefInfo.hpp b/src/xercesc/framework/XMLRefInfo.hpp
index 9d24ab750ea5a3d2dbab9487aa8a65dde0ee6ac3..77e5a240e582bacc8d1f9c2148155d01071c2194 100644
--- a/src/xercesc/framework/XMLRefInfo.hpp
+++ b/src/xercesc/framework/XMLRefInfo.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:52 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:52 peiyongz
+ * sane_include
*
* Revision 1.5 2000/07/07 22:23:38 jpolast
* remove useless getKey() functions.
@@ -83,6 +86,9 @@
#if !defined(XMLIDREFINFO_HPP)
#define XMLIDREFINFO_HPP
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
/**
* This class provides a simple means to track ID Ref usage. Since id/idref
@@ -216,5 +222,6 @@ inline void XMLRefInfo::setUsed(const bool newValue)
fUsed = newValue;
}
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/framework/XMLValidator.cpp b/src/xercesc/framework/XMLValidator.cpp
index 2d0194a149d706166edefa908ed84629675c483a..db934500f2ccff52c2cc6d183bbad6beef7a18b2 100644
--- a/src/xercesc/framework/XMLValidator.cpp
+++ b/src/xercesc/framework/XMLValidator.cpp
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:21:52 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:52 peiyongz
+ * sane_include
*
* Revision 1.13 2001/11/30 22:18:18 peiyongz
* cleanUp function made member function
@@ -126,6 +129,7 @@
#include <xercesc/framework/XMLValidator.hpp>
#include <xercesc/internal/XMLScanner.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local static functions
@@ -165,7 +169,7 @@ static XMLMsgLoader& getMsgLoader()
// Lock the mutex
XMLMutexLock lockInit(&gValidatorMutex());
-
+
if (!sMsgLoader)
{
sMsgLoader = XMLPlatformUtils::loadMsgSet(XMLUni::fgValidityDomain);
@@ -390,3 +394,5 @@ void XMLValidator::reinitMsgLoader()
delete sMsgLoader;
sMsgLoader = 0;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/framework/XMLValidator.hpp b/src/xercesc/framework/XMLValidator.hpp
index 14fc8ab7aa1c97b4766fde2391414db0ecc766f8..cbe3926b8962ac87c5426aeb4b3db5b09e8ad1e6 100644
--- a/src/xercesc/framework/XMLValidator.hpp
+++ b/src/xercesc/framework/XMLValidator.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2002/11/04 15:00:21 tng
+ * C++ Namespace Support.
+ *
* Revision 1.5 2002/09/04 18:17:55 tng
* Do not set IDREF to used during prevalidation.
*
@@ -143,6 +146,8 @@
#include <xercesc/framework/XMLValidityCodes.hpp>
#include <xercesc/framework/XMLRefInfo.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ReaderMgr;
class XMLBuffer;
class XMLBufferMgr;
@@ -547,5 +552,6 @@ inline XMLScanner* XMLValidator::getScanner()
return fScanner;
}
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/framework/XMLValidityCodes.hpp b/src/xercesc/framework/XMLValidityCodes.hpp
index 60891ed91da7c262e3ec430bdc51c7da3c14c70b..91f82581b3ec3c923dd85d43d25b16c491e949fd 100644
--- a/src/xercesc/framework/XMLValidityCodes.hpp
+++ b/src/xercesc/framework/XMLValidityCodes.hpp
@@ -4,6 +4,9 @@
#define ERRHEADER_XMLValid
#include <xercesc/framework/XMLErrorReporter.hpp>
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
class XMLValid
{
@@ -150,5 +153,8 @@ public :
return XMLErrorReporter::ErrTypes_Unknown;
}
};
+
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/internal/CharTypeTables.hpp b/src/xercesc/internal/CharTypeTables.hpp
index 112463f413fc0d229a7757c11514404ae4eff2de..64e0239b4e2e9bcbbc3562fc06ddbbc4a0956c41 100644
--- a/src/xercesc/internal/CharTypeTables.hpp
+++ b/src/xercesc/internal/CharTypeTables.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:57 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:57 peiyongz
+ * sane_include
*
* Revision 1.4 2001/07/26 19:53:02 tng
* [Bug 2751] Several NameChar characters missing from internal tables .
@@ -76,6 +79,12 @@
*
*/
+#if !defined(CHARTYPETABLES_HPP)
+#define CHARTYPETABLES_HPP
+
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// These are character type lookup tables. They are included into XMLReader
@@ -254,3 +263,7 @@ static const XMLCh gXMLChars[] =
, 0x0009, 0x000D, 0x000A
, 0x00
};
+
+XERCES_CPP_NAMESPACE_END
+
+#endif
diff --git a/src/xercesc/internal/ElemStack.cpp b/src/xercesc/internal/ElemStack.cpp
index 20e443f64408bd0e1cef020418a4bf50aea3c576..220fef71b29d25aabb32faf723c817ffb444cba6 100644
--- a/src/xercesc/internal/ElemStack.cpp
+++ b/src/xercesc/internal/ElemStack.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:57 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:57 peiyongz
+ * sane_include
*
* Revision 1.17 2001/12/12 14:29:50 tng
* Remove obsolete code in ElemStack which can help performance.
@@ -129,6 +132,7 @@
#include <xercesc/internal/ElemStack.hpp>
#include <xercesc/validators/common/Grammar.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// ElemStack: Constructors and Destructor
@@ -524,3 +528,5 @@ void ElemStack::expandStack()
fStack = newStack;
fStackCapacity = newCapacity;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/internal/ElemStack.hpp b/src/xercesc/internal/ElemStack.hpp
index 320737617902116ff5b7de3dd8922285946efccf..a6483225b8fbcee4295fa284e013954d240ca5aa 100644
--- a/src/xercesc/internal/ElemStack.hpp
+++ b/src/xercesc/internal/ElemStack.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:58 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:58 peiyongz
+ * sane_include
*
* Revision 1.11 2001/12/12 14:29:50 tng
* Remove obsolete code in ElemStack which can help performance.
@@ -105,6 +108,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/StringPool.hpp>
#include <xercesc/util/QName.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLElementDecl;
class Grammar;
@@ -382,4 +388,6 @@ inline void ElemStack::setCurrentURI(unsigned int uri)
return;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/internal/EndOfEntityException.hpp b/src/xercesc/internal/EndOfEntityException.hpp
index cdb08dc84fbada2c8019be3ef8dca8488d55b604..23e4f8db3c3af89c38ad62832111b8d58dc29e05 100644
--- a/src/xercesc/internal/EndOfEntityException.hpp
+++ b/src/xercesc/internal/EndOfEntityException.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:58 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:58 peiyongz
+ * sane_include
*
* Revision 1.3 2000/02/24 20:18:07 abagchi
* Swat for removing Log from API docs
@@ -77,6 +80,10 @@
#if !defined(ENDOFENTITYEXCEPTION_HPP)
#define ENDOFENTITYEXCEPTION_HPP
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLEntityDecl;
//
@@ -157,4 +164,6 @@ inline unsigned int EndOfEntityException::getReaderNum() const
return fReaderNum;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/internal/IANAEncodings.hpp b/src/xercesc/internal/IANAEncodings.hpp
index d00a3d5e137a653540e4e6325dc763a75a093035..2db6bbf52e1773fc166591b16de6dd045b0fd988 100644
--- a/src/xercesc/internal/IANAEncodings.hpp
+++ b/src/xercesc/internal/IANAEncodings.hpp
@@ -1,9 +1,16 @@
+#if !defined(IANAENCODINGS_HPP)
+#define IANAENCODINGS_HPP
+
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
// ----------------------------------------------------------------
// This file was generated from the IANA charset source.
// so do not edit this file directly!!
// ----------------------------------------------------------------
-const XMLCh gEncodingArray[][128] =
+const XMLCh gEncodingArray[][128] =
{
{ 0x0041,0x004E,0x0053,0x0049,0x005F,0x0058,0x0033,0x002E,0x0034,0x002D,0x0031,0x0039,0x0036,0x0038,0x00 }
, { 0x0069,0x0073,0x006F,0x002D,0x0069,0x0072,0x002D,0x0036,0x00 }
@@ -800,3 +807,7 @@ const XMLCh gEncodingArray[][128] =
};
const unsigned int gEncodingArraySize = 791;
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
diff --git a/src/xercesc/internal/ReaderMgr.cpp b/src/xercesc/internal/ReaderMgr.cpp
index aedf5712d8e2161eb5aef257bdd1f8529c0b443d..3b8c32a625500640d6086f33e6b5b49cfc4554e2 100644
--- a/src/xercesc/internal/ReaderMgr.cpp
+++ b/src/xercesc/internal/ReaderMgr.cpp
@@ -79,6 +79,8 @@
#include <xercesc/internal/EndOfEntityException.hpp>
#include <xercesc/internal/ReaderMgr.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ReaderMgr: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -1074,3 +1076,5 @@ bool ReaderMgr::popReader()
}
return true;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/internal/ReaderMgr.hpp b/src/xercesc/internal/ReaderMgr.hpp
index 2ea7154ae1b7da193c738f7ad80e33c4729a42ea..be8ca977877a5e4974a7a6b7ebcd36c35e87a091 100644
--- a/src/xercesc/internal/ReaderMgr.hpp
+++ b/src/xercesc/internal/ReaderMgr.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/08/22 19:28:11 tng
* [Bug 11448] DomCount has problems with XHTML1.1 DTD.
*
@@ -133,6 +136,8 @@
#include <xercesc/framework/XMLBuffer.hpp>
#include <xercesc/internal/XMLReader.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLBuffer;
class XMLEntityDecl;
class XMLEntityHandler;
@@ -480,4 +485,6 @@ private :
ReaderMgr* fMgr;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/internal/VecAttrListImpl.cpp b/src/xercesc/internal/VecAttrListImpl.cpp
index 1a8ed419dcdd3302eec4c0c8307789cf9c5da55f..04d9d1996e7e5d83b9867d2443c8c1265cf704cf 100644
--- a/src/xercesc/internal/VecAttrListImpl.cpp
+++ b/src/xercesc/internal/VecAttrListImpl.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/09/24 20:02:20 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -103,6 +106,7 @@
#include <xercesc/util/Janitor.hpp>
#include <xercesc/internal/VecAttrListImpl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Constructors and Destructor
@@ -231,3 +235,5 @@ void VecAttrListImpl::setVector(const RefVectorOf<XMLAttr>* const srcVec
fCount = count;
fVector = srcVec;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/internal/VecAttrListImpl.hpp b/src/xercesc/internal/VecAttrListImpl.hpp
index 7e1fe214240b4938ffa690a6a42f5b15ef71cd98..63fe524084ac2429ab4744f1d095c3f59d1d99a7 100644
--- a/src/xercesc/internal/VecAttrListImpl.hpp
+++ b/src/xercesc/internal/VecAttrListImpl.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:58 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:58 peiyongz
+ * sane_include
*
* Revision 1.4 2000/02/24 20:18:07 abagchi
* Swat for removing Log from API docs
@@ -85,6 +88,8 @@
#include <xercesc/framework/XMLAttr.hpp>
#include <xercesc/util/RefVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLPARSER_EXPORT VecAttrListImpl : public AttributeList
{
public :
@@ -148,4 +153,6 @@ private :
const RefVectorOf<XMLAttr>* fVector;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/internal/VecAttributesImpl.cpp b/src/xercesc/internal/VecAttributesImpl.cpp
index 3b487ac87114905efc05d1f9296edea1f51936a7..22e503b09c1adcac6e0267081c32ed9b84f8e1e0 100644
--- a/src/xercesc/internal/VecAttributesImpl.cpp
+++ b/src/xercesc/internal/VecAttributesImpl.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 20:02:20 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -96,6 +99,7 @@
#include <xercesc/util/Janitor.hpp>
#include <xercesc/internal/VecAttributesImpl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Constructors and Destructor
@@ -260,3 +264,4 @@ void VecAttributesImpl::setVector(const RefVectorOf<XMLAttr>* const srcVec
fScanner = scanner ;
}
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/internal/VecAttributesImpl.hpp b/src/xercesc/internal/VecAttributesImpl.hpp
index 733e8939f9c9921604d2996547d0d3b8e0ec7289..42b2b1c9daa8240745d628ecdb09dce61c27dac0 100644
--- a/src/xercesc/internal/VecAttributesImpl.hpp
+++ b/src/xercesc/internal/VecAttributesImpl.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:58 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:58 peiyongz
+ * sane_include
*
* Revision 1.5 2001/05/11 13:26:16 tng
* Copyright update.
@@ -89,6 +92,8 @@
#include <xercesc/internal/XMLScanner.hpp>
#include <xercesc/framework/XMLBuffer.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLPARSER_EXPORT VecAttributesImpl : public Attributes
{
public :
@@ -170,4 +175,6 @@ private :
//XMLBuffer fURIBuffer ;
};
+XERCES_CPP_NAMESPACE_END
+
#endif // ! VECATTRIBUTESIMPL_HPP
diff --git a/src/xercesc/internal/XMLInternalErrorHandler.hpp b/src/xercesc/internal/XMLInternalErrorHandler.hpp
index f30e236e6d27ba74ab0e8f493e027c199d24d8b1..d52a0b42b28cc4780b2966d2fb29673ef5a9c2a3 100644
--- a/src/xercesc/internal/XMLInternalErrorHandler.hpp
+++ b/src/xercesc/internal/XMLInternalErrorHandler.hpp
@@ -1,4 +1,3 @@
-
/*
* The Apache Software License, Version 1.1
*
@@ -57,17 +56,25 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:58 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:58:18 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:58 peiyongz
+ * sane_include
*
* Revision 1.1 2001/07/26 17:04:10 tng
* Schema: Process should stop after fatal error, and user throws need to be rethrown.
*
*/
+#if !defined(XMLINTERNALERRORHANDLER_HPP)
+#define XMLINTERNALERRORHANDLER_HPP
+
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/sax/ErrorHandler.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLInternalErrorHandler : public ErrorHandler
{
public:
@@ -167,3 +174,7 @@ inline void XMLInternalErrorHandler::resetErrors()
fSawError = false;
fSawFatal = false;
}
+
+XERCES_CPP_NAMESPACE_END
+
+#endif
diff --git a/src/xercesc/internal/XMLReader.cpp b/src/xercesc/internal/XMLReader.cpp
index fa29544113c0b93c8b465ed3205e8eb34a5e3a55..ae0b91714f2c40c9fea287aed1370d65f00e37fd 100644
--- a/src/xercesc/internal/XMLReader.cpp
+++ b/src/xercesc/internal/XMLReader.cpp
@@ -78,6 +78,7 @@
#include <xercesc/internal/XMLScanner.hpp>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLReader: static data initialization
@@ -5911,3 +5912,5 @@ XMLByte XMLReader::fgCharCharsTable[0x10000] =
, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48
, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x00, 0x00
};
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/internal/XMLReader.hpp b/src/xercesc/internal/XMLReader.hpp
index 71c1ed972719f8bfa4899d64922a5c84e887bc49..9f5f1b21023b07f878b0097f7f0f16bd579356e7 100644
--- a/src/xercesc/internal/XMLReader.hpp
+++ b/src/xercesc/internal/XMLReader.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:58:19 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/27 12:56:23 tng
* [Bug 12740] Extra include. By Peter Volchek.
*
@@ -140,6 +143,8 @@
#include <xercesc/framework/XMLRecognizer.hpp>
#include <xercesc/framework/XMLBuffer.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class InputSource;
class BinInputStream;
class ReaderMgr;
@@ -832,4 +837,6 @@ inline bool XMLReader::getNextCharIfNot(const XMLCh chNotToGet, XMLCh& chGotten)
return true;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/internal/XMLScanner.cpp b/src/xercesc/internal/XMLScanner.cpp
index 7da22112fb1afebb3408a318d5c708714117e94d..ddc86d57508dfbfb6f225009f73256845f9a87b8 100644
--- a/src/xercesc/internal/XMLScanner.cpp
+++ b/src/xercesc/internal/XMLScanner.cpp
@@ -94,6 +94,8 @@
#include <xercesc/validators/schema/identity/IC_Selector.hpp>
#include <xercesc/validators/schema/identity/ValueStore.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Local static data
// ---------------------------------------------------------------------------
@@ -4557,4 +4559,6 @@ Grammar* XMLScanner::loadDTDGrammar(const InputSource& src,
void XMLScanner::resetCachedGrammarPool()
{
fGrammarResolver->resetCachedGrammar();
-}
\ No newline at end of file
+}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/internal/XMLScanner.hpp b/src/xercesc/internal/XMLScanner.hpp
index 5c63f8c62fa4c55f49d910faa289d38e6a2beda5..bdd9ee30055fdb59397a86fc669378fbd765d2aa 100644
--- a/src/xercesc/internal/XMLScanner.hpp
+++ b/src/xercesc/internal/XMLScanner.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2002/11/04 14:58:19 tng
+ * C++ Namespace Support.
+ *
* Revision 1.11 2002/08/27 05:56:39 knoaman
* Identity Constraint: handle case of recursive elements.
*
@@ -247,6 +250,8 @@
#include <xercesc/validators/DTD/DTDValidator.hpp>
#include <xercesc/validators/schema/SchemaValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class InputSource;
class XMLDocumentHandler;
class DocTypeHandler;
@@ -1405,4 +1410,6 @@ inline void XMLScanner::setDoValidation(const bool validate)
fValScheme = Val_Never;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/internal/XMLScanner2.cpp b/src/xercesc/internal/XMLScanner2.cpp
index 5e4dd8ecd26239206c97c71d9508009251c35774..26bcb789bc730b6c97831af499a08703ce771035 100644
--- a/src/xercesc/internal/XMLScanner2.cpp
+++ b/src/xercesc/internal/XMLScanner2.cpp
@@ -96,6 +96,7 @@
#include <xercesc/validators/schema/identity/XPathMatcherStack.hpp>
#include <xercesc/validators/schema/XSDDOMParser.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLScanner: Private helper methods
@@ -3216,10 +3217,12 @@ void XMLScanner::normalizeURI(const XMLCh* const systemURI,
}
else if (*pszSrc == 0xFFFF) { //escaped character
pszSrc++;
- }
+ }
else {
normalizedURI.append(*pszSrc);
pszSrc++;
}
}
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/parsers/AbstractDOMParser.cpp b/src/xercesc/parsers/AbstractDOMParser.cpp
index 67dabfd4db9efdf9edd4047e3c9914005469dd0b..90a74060c1608de23ae161d31e1bf2fa0a8577d3 100644
--- a/src/xercesc/parsers/AbstractDOMParser.cpp
+++ b/src/xercesc/parsers/AbstractDOMParser.cpp
@@ -96,6 +96,9 @@
#include <xercesc/validators/common/ContentSpecNode.hpp>
#include <xercesc/validators/DTD/DTDAttDefList.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
// ---------------------------------------------------------------------------
// AbstractDOMParser: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -1385,3 +1388,5 @@ void AbstractDOMParser::TextDecl
}
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/parsers/AbstractDOMParser.hpp b/src/xercesc/parsers/AbstractDOMParser.hpp
index 4f2f8d038439059035acb1762c9e831cc8db290e..5ffa5d60869db66984b193ed44fc08ee3056fd64 100644
--- a/src/xercesc/parsers/AbstractDOMParser.hpp
+++ b/src/xercesc/parsers/AbstractDOMParser.hpp
@@ -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;
@@ -1449,6 +1452,8 @@ inline void AbstractDOMParser::setParseInProgress(const bool toSet)
fParseInProgress = toSet;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/parsers/DOMBuilderImpl.cpp b/src/xercesc/parsers/DOMBuilderImpl.cpp
index 932bdbd28b0e0db0da3d95b501cc2cb021fb011b..71c42b1e53c939025e8b4a63ee736c45173b6cde 100644
--- a/src/xercesc/parsers/DOMBuilderImpl.cpp
+++ b/src/xercesc/parsers/DOMBuilderImpl.cpp
@@ -79,6 +79,9 @@
#include <xercesc/internal/XMLScanner.hpp>
#include <xercesc/framework/Wrapper4DOMInputSource.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
// ---------------------------------------------------------------------------
// DOMBuilderImpl: Constructors and Destructor
@@ -592,3 +595,5 @@ const XMLCh* DOMBuilderImpl::getURIText(unsigned int uriId) const
return getScanner()->getURIText(uriId);
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/parsers/DOMBuilderImpl.hpp b/src/xercesc/parsers/DOMBuilderImpl.hpp
index 6b0daa18c869437f508d7ec74e7855ac4400f245..bf67edbd7b526d038ff848cfe8c55cadbd2c94ae 100644
--- a/src/xercesc/parsers/DOMBuilderImpl.hpp
+++ b/src/xercesc/parsers/DOMBuilderImpl.hpp
@@ -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
@@ -873,4 +877,6 @@ inline const DOMBuilderFilter* DOMBuilderImpl::getFilter() const
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/parsers/SAX2XMLReaderImpl.cpp b/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
index 14e1c40b7d6c1579bcb2f87465d5552e2d4a2e45..e928825086565a05032494e799d2d5c2992a1353 100644
--- a/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
+++ b/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
@@ -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 @@ void SAX2XMLReaderImpl::resetCachedGrammarPool()
{
fScanner->resetCachedGrammarPool();
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/parsers/SAX2XMLReaderImpl.hpp b/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
index 9c7cb7833f08efbb61fb9293ac675e4eebb8b84a..f8f80534d0d57b3abaed523057495991de075f7f 100644
--- a/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
+++ b/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
@@ -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 @@ public :
*
* @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);
//@}
@@ -1811,4 +1817,6 @@ inline const XMLCh* SAX2XMLReaderImpl::getURIText(unsigned int uriId)
return fScanner->getURIText(uriId);
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/parsers/SAXParser.cpp b/src/xercesc/parsers/SAXParser.cpp
index 9e8da44a42335f40c28c9f0ce8a1f9cf1aad77c1..b5d0f27da98b63accac3899fdefb987fc27d0571 100644
--- a/src/xercesc/parsers/SAXParser.cpp
+++ b/src/xercesc/parsers/SAXParser.cpp
@@ -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 @@ void SAXParser::resetCachedGrammarPool()
{
fScanner->resetCachedGrammarPool();
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/parsers/SAXParser.hpp b/src/xercesc/parsers/SAXParser.hpp
index ec1bf8f22eb8bbb3472d758b02c164b0cdda9b28..36afca30880cd79b9e45fb413207e13c59cd4a8c 100644
--- a/src/xercesc/parsers/SAXParser.hpp
+++ b/src/xercesc/parsers/SAXParser.hpp
@@ -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 @@ public :
*
* @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);
//@}
@@ -1897,4 +1903,6 @@ inline const XMLScanner& SAXParser::getScanner() const
return *fScanner;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/parsers/XercesDOMParser.cpp b/src/xercesc/parsers/XercesDOMParser.cpp
index f7e4bce2d5c6219ce35e3c9da32efaa6166768e5..cdf7c343a021fb9274e482bd2078f8d0ee0ed24b 100644
--- a/src/xercesc/parsers/XercesDOMParser.cpp
+++ b/src/xercesc/parsers/XercesDOMParser.cpp
@@ -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 @@ void XercesDOMParser::resetCachedGrammarPool()
{
getScanner()->resetCachedGrammarPool();
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/parsers/XercesDOMParser.hpp b/src/xercesc/parsers/XercesDOMParser.hpp
index 1c44d1ca1f372446c4657f27fdf7369f65e35536..35241590a88f5b9a6a0088e9940c826c3228803c 100644
--- a/src/xercesc/parsers/XercesDOMParser.hpp
+++ b/src/xercesc/parsers/XercesDOMParser.hpp
@@ -65,6 +65,9 @@
#include <xercesc/parsers/AbstractDOMParser.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
+
class EntityResolver;
class ErrorHandler;
class Grammar;
@@ -195,7 +198,7 @@ public :
*
* @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);
//@}
@@ -632,4 +635,6 @@ inline const EntityResolver* XercesDOMParser::getEntityResolver() const
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax/AttributeList.hpp b/src/xercesc/sax/AttributeList.hpp
index ec8f47317072264f2de70d10ba78676c016c6b3b..1a6b8678e8f94e941393aaf4abbfa4280c7b4066 100644
--- a/src/xercesc/sax/AttributeList.hpp
+++ b/src/xercesc/sax/AttributeList.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:07 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:56:25 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:07 peiyongz
+ * sane_include
*
* Revision 1.8 2000/03/02 19:54:34 roddey
* This checkin includes many changes done while waiting for the
@@ -96,6 +99,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* Interface for an element's attribute specifications.
*
@@ -140,10 +145,10 @@
* }
* </pre>
*
- * The AttributeListImpl helper class provides a convenience
+ * The AttributeListImpl helper class provides a convenience
* implementation for use by parser or application writers.
*
- * @see DocumentHandler#startElement
+ * @see DocumentHandler#startElement
* @see AttributeListImpl#AttributeListImpl
*/
@@ -176,7 +181,7 @@ public:
* declared or specified. The number of attributes may be
* zero.
*
- * @return The number of attributes in the list.
+ * @return The number of attributes in the list.
*/
virtual unsigned int getLength() const = 0;
@@ -194,7 +199,7 @@ public:
* @param index The index of the attribute in the list (starting at 0).
* @return The name of the indexed attribute, or null
* if the index is out of range.
- * @see #getLength
+ * @see #getLength
*/
virtual const XMLCh* getName(const unsigned int index) const = 0;
@@ -216,7 +221,7 @@ public:
* @param index The index of the attribute in the list (starting at 0).
* @return The attribute type as a string, or
* null if the index is out of range.
- * @see #getLength
+ * @see #getLength
* @see #getType(String)
*/
virtual const XMLCh* getType(const unsigned int index) const = 0;
@@ -294,7 +299,9 @@ private :
AttributeList(const AttributeList&);
/* Assignment operator */
void operator=(const AttributeList&);
-
+
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax/DTDHandler.hpp b/src/xercesc/sax/DTDHandler.hpp
index f6e1f4b25ae030739b222cfaecb5ea0ba9ae2629..002f45806119e4d13e46502439e1d04a4f774a66 100644
--- a/src/xercesc/sax/DTDHandler.hpp
+++ b/src/xercesc/sax/DTDHandler.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:56:25 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/20 18:17:01 tng
* [Bug 5977] Warnings on generating apiDocs.
*
@@ -86,6 +89,10 @@
#ifndef DTDHANDLER_HPP
#define DTDHANDLER_HPP
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* Receive notification of basic DTD-related events.
*
@@ -214,4 +221,6 @@ private :
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax/DocumentHandler.hpp b/src/xercesc/sax/DocumentHandler.hpp
index 4a57e4f64a0ab442e9bc650b5db6a78974eb948c..8c83d56d5ec55e316c63841398cbe8db2b1832db 100644
--- a/src/xercesc/sax/DocumentHandler.hpp
+++ b/src/xercesc/sax/DocumentHandler.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:08 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:56:25 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:08 peiyongz
+ * sane_include
*
* Revision 1.6 2000/03/02 19:54:34 roddey
* This checkin includes many changes done while waiting for the
@@ -90,6 +93,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class AttributeList;
class Locator;
@@ -97,9 +102,9 @@ class Locator;
* Receive notification of general document events.
*
* <p>This is the main interface that most SAX applications
- * implement: if the application needs to be informed of basic parsing
- * events, it implements this interface and registers an instance with
- * the SAX parser using the setDocumentHandler method. The parser
+ * implement: if the application needs to be informed of basic parsing
+ * events, it implements this interface and registers an instance with
+ * the SAX parser using the setDocumentHandler method. The parser
* uses the instance to report basic document-related events like
* the start and end of elements and character data.</p>
*
@@ -138,7 +143,7 @@ public:
//@}
/** @name The virtual document handler interface */
-
+
//@{
/**
* Receive notification of character data.
@@ -161,7 +166,7 @@ public:
* @param length The number of characters to read from the array.
* @exception SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see #ignorableWhitespace
+ * @see #ignorableWhitespace
* @see Locator#Locator
*/
virtual void characters
@@ -324,7 +329,7 @@ public:
* @exception SAXException Any SAX exception, possibly
* wrapping another exception.
* @see #endElement
- * @see AttributeList#AttributeList
+ * @see AttributeList#AttributeList
*/
virtual void startElement
(
@@ -342,4 +347,6 @@ private :
void operator=(const DocumentHandler&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax/Dummy.cpp b/src/xercesc/sax/Dummy.cpp
index 6010218d6b4ee51234eff82c66a02e7ad04f030d..19a62a5e20fde0718fa946c6c2e318785298e329 100644
--- a/src/xercesc/sax/Dummy.cpp
+++ b/src/xercesc/sax/Dummy.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:08 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:56:25 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:08 peiyongz
+ * sane_include
*
* Revision 1.3 2000/03/02 19:54:34 roddey
* This checkin includes many changes done while waiting for the
@@ -87,3 +90,6 @@
#include <xercesc/sax/Parser.hpp>
#include <xercesc/sax/SAXException.hpp>
#include <xercesc/sax/SAXParseException.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/sax/EntityResolver.hpp b/src/xercesc/sax/EntityResolver.hpp
index 965dce5175a9104812d35b88cfbf095aaf61026e..b7b256552ec241b42b2e39105f8d54925c300fd5 100644
--- a/src/xercesc/sax/EntityResolver.hpp
+++ b/src/xercesc/sax/EntityResolver.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:56:25 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/06/06 20:39:16 tng
* Document Fix: document that the returned object from resolveEntity is owned by the parser
*
@@ -93,6 +96,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class InputSource;
/**
@@ -227,4 +232,6 @@ private :
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax/ErrorHandler.hpp b/src/xercesc/sax/ErrorHandler.hpp
index 80a9dd7715383ae6747cbc7b9bf902a04e541b4a..0048032c11b42bdfb9f53fbd02dff21b7be2846d 100644
--- a/src/xercesc/sax/ErrorHandler.hpp
+++ b/src/xercesc/sax/ErrorHandler.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:08 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:56:25 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:08 peiyongz
+ * sane_include
*
* Revision 1.6 2000/04/27 19:33:15 rahulj
* Included <util/XercesDefs.hpp> as suggested by David N Bertoni.
@@ -88,6 +91,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class SAXParseException;
@@ -115,7 +120,7 @@ class SAXParseException;
* itself.</p>
*
* @see Parser#setErrorHandler
- * @see SAXParseException#SAXParseException
+ * @see SAXParseException#SAXParseException
* @see HandlerBase#HandlerBase
*/
@@ -152,7 +157,7 @@ public:
* SAX parse exception.
* @exception SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see SAXParseException#SAXParseException
+ * @see SAXParseException#SAXParseException
*/
virtual void warning(const SAXParseException& exception) = 0;
@@ -176,7 +181,7 @@ public:
* SAX parse exception.
* @exception SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see SAXParseException#SAXParseException
+ * @see SAXParseException#SAXParseException
*/
virtual void error(const SAXParseException& exception) = 0;
@@ -195,13 +200,13 @@ public:
* other events once this method has been invoked.</p>
*
* @param exception The error information encapsulated in a
- * SAX parse exception.
+ * SAX parse exception.
* @exception SAXException Any SAX exception, possibly
* wrapping another exception.
* @see SAXParseException#SAXParseException
*/
virtual void fatalError(const SAXParseException& exception) = 0;
-
+
/**
* Reset the Error handler object on its reuse
*
@@ -216,13 +221,15 @@ public:
private :
/* Unimplemented constructors and operators */
-
+
/* Copy constructor */
ErrorHandler(const ErrorHandler&);
/* Assignment operator */
void operator=(const ErrorHandler&);
-
+
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax/HandlerBase.hpp b/src/xercesc/sax/HandlerBase.hpp
index 014ff02ff4b478fb376c8ac38a1f703a01708dfe..a3108233d59ca5c566520458c9cd27ce902b06ae 100644
--- a/src/xercesc/sax/HandlerBase.hpp
+++ b/src/xercesc/sax/HandlerBase.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:56:25 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/07/16 18:15:00 tng
* [Bug 6070] warning unused variable in HandlerBase.hpp
*
@@ -103,6 +106,8 @@
#include <xercesc/sax/ErrorHandler.hpp>
#include <xercesc/sax/SAXParseException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class Locator;
class AttributeList;
@@ -524,4 +529,6 @@ inline void HandlerBase::warning(const SAXParseException&)
{
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax/InputSource.cpp b/src/xercesc/sax/InputSource.cpp
index b41a6b81e3f2f0be210703d2528574cb0e3bf2aa..a22d638bcb88dd072003455b62cff50ca21aa8ce 100644
--- a/src/xercesc/sax/InputSource.cpp
+++ b/src/xercesc/sax/InputSource.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:08 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:56:26 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:08 peiyongz
+ * sane_include
*
* Revision 1.5 2001/11/21 16:14:32 tng
* Schema: New method InputSource::get/setIssueFatalErrorIfNotFound to tell the parser whether to issue fatal error or not if cannot find it (the InputSource). This is required for schema processing as it shouldn't be a fatal error if the schema is not found.
@@ -89,7 +92,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/sax/InputSource.hpp>
-
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// InputSource: Destructor
@@ -176,3 +179,6 @@ InputSource::InputSource(const char* const systemId
, fFatalErrorIfNotFound(true)
{
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/sax/InputSource.hpp b/src/xercesc/sax/InputSource.hpp
index 2cd3d83510ce8e27bb4b0ee829af45a0f3102e35..08e7761a3e58dec6ff850648872bf2003f80316f 100644
--- a/src/xercesc/sax/InputSource.hpp
+++ b/src/xercesc/sax/InputSource.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:56:26 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/30 18:26:18 tng
* Since the derived class Wrapper4DOMInputSource has overwritten the set/getEncoding, SystemId, PublicId ... etc., these functions has to be virtual for them to work.
*
@@ -109,6 +112,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class BinInputStream;
@@ -395,4 +400,6 @@ inline void InputSource::setIssueFatalErrorIfNotFound(const bool flag)
fFatalErrorIfNotFound = flag;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax/Locator.hpp b/src/xercesc/sax/Locator.hpp
index 2e0b7e6f351b9aa74726fcd8c16366743f8395f5..8d59d07cfedbe6a31a0a6396699b2777c8255e20 100644
--- a/src/xercesc/sax/Locator.hpp
+++ b/src/xercesc/sax/Locator.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:56:26 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/05/27 18:33:07 tng
* To get ready for 64 bit large file, use XMLSSize_t to represent line and column number.
*
@@ -92,6 +95,9 @@
#define LOCATOR_HPP
#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* Interface for associating a SAX event with a document location.
*
@@ -186,4 +192,6 @@ private :
void operator=(const Locator&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax/Parser.hpp b/src/xercesc/sax/Parser.hpp
index 321a28cfce249e13051e3382c7d659e1589c34d6..0952c6a540839829d5d1923e0486d8a8b0e3b699 100644
--- a/src/xercesc/sax/Parser.hpp
+++ b/src/xercesc/sax/Parser.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:56:26 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/07/11 18:29:09 knoaman
* Grammar caching/preparsing - initial implementation.
*
@@ -96,6 +99,10 @@
#ifndef PARSER_HPP
#define PARSER_HPP
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
class DTDHandler;
class EntityResolver;
class DocumentHandler;
@@ -310,4 +317,6 @@ private :
void operator=(const Parser&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax/SAXException.cpp b/src/xercesc/sax/SAXException.cpp
index 0c79bc5d8f412c54a7d4edb72bc330ec819fa9ef..4c9a14be33be17dd2bb6a951db8138e7dfc0e28d 100644
--- a/src/xercesc/sax/SAXException.cpp
+++ b/src/xercesc/sax/SAXException.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:08 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:56:26 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:08 peiyongz
+ * sane_include
*
* Revision 1.1 2000/08/09 22:06:04 jpolast
* more functionality to SAXException and its children.
@@ -69,6 +72,8 @@
#include "SAXException.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
// SAXNotSupportedException Constructors
SAXNotSupportedException::SAXNotSupportedException()
@@ -111,3 +116,6 @@ SAXNotRecognizedException::SAXNotRecognizedException(const SAXException& toCopy)
: SAXException(toCopy)
{
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/sax/SAXException.hpp b/src/xercesc/sax/SAXException.hpp
index 4f7f948844396d3b37b9ad816d7875f2978d7620..252573dc9aef1121aff1c2352fd43c3030548dec 100644
--- a/src/xercesc/sax/SAXException.hpp
+++ b/src/xercesc/sax/SAXException.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:08 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:56:26 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:08 peiyongz
+ * sane_include
*
* Revision 1.8 2000/09/07 23:55:02 andyh
* Fix SAXException assignment operator. Now non-virtual, and
@@ -99,6 +102,8 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/XMLUni.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* Encapsulate a general SAX error or warning.
@@ -124,7 +129,7 @@ class SAX_EXPORT SAXException
public:
/** @name Constructors and Destructor */
//@{
- /** Default constructor
+ /** Default constructor
*/
SAXException() :
@@ -270,4 +275,6 @@ public:
SAXNotRecognizedException(const SAXException& toCopy);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax/SAXParseException.cpp b/src/xercesc/sax/SAXParseException.cpp
index e09f88560dac5ccaa84770ec1dbc2490269d9eda..5868492e10afa290bca8d30ca44703f989bb3751 100644
--- a/src/xercesc/sax/SAXParseException.cpp
+++ b/src/xercesc/sax/SAXParseException.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:56:26 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/05/27 18:33:07 tng
* To get ready for 64 bit large file, use XMLSSize_t to represent line and column number.
*
@@ -90,6 +93,7 @@
#include <xercesc/sax/Locator.hpp>
#include <xercesc/sax/SAXParseException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// SAXParseException: Constructors and Destructor
@@ -181,3 +185,6 @@ XMLSSize_t SAXParseException::getColumnNumber() const
{
return fColumnNumber;
}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/sax/SAXParseException.hpp b/src/xercesc/sax/SAXParseException.hpp
index 59e35f109d2d07bc950d870df409f71fd48f011f..c09b7400ca92ee0a57f9d59b9c8b1a96bd15d289 100644
--- a/src/xercesc/sax/SAXParseException.hpp
+++ b/src/xercesc/sax/SAXParseException.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:56:26 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/05/27 18:33:07 tng
* To get ready for 64 bit large file, use XMLSSize_t to represent line and column number.
*
@@ -88,6 +91,8 @@
#include <xercesc/sax/SAXException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class Locator;
/**
@@ -236,4 +241,6 @@ private:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax2/Attributes.hpp b/src/xercesc/sax2/Attributes.hpp
index 381e28a08293a5cff966c24dc6dd1aca7ac33500..8b00fa6395df66533c389b1f1fe42b05d34e1a4a 100644
--- a/src/xercesc/sax2/Attributes.hpp
+++ b/src/xercesc/sax2/Attributes.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:55:45 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/20 18:17:02 tng
* [Bug 5977] Warnings on generating apiDocs.
*
@@ -97,6 +100,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* Interface for an element's attribute specifications.
*
@@ -352,4 +357,6 @@ private :
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax2/ContentHandler.hpp b/src/xercesc/sax2/ContentHandler.hpp
index 51f3c9b59d2fa2c56386ca9e5965f289eeb009e4..07d83769d126f663007278321d5ecdd9a8105f23 100644
--- a/src/xercesc/sax2/ContentHandler.hpp
+++ b/src/xercesc/sax2/ContentHandler.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:09 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:55:45 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:09 peiyongz
+ * sane_include
*
* Revision 1.4 2000/12/14 18:50:05 tng
* Fix API document generation warning: "Warning: end of member group without matching begin"
@@ -92,6 +95,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class Attributes;
class Locator;
@@ -99,9 +104,9 @@ class Locator;
* Receive notification of general document events.
*
* <p>This is the main interface that most SAX2 applications
- * implement: if the application needs to be informed of basic parsing
- * events, it implements this interface and registers an instance with
- * the SAX2 parser using the setDocumentHandler method. The parser
+ * implement: if the application needs to be informed of basic parsing
+ * events, it implements this interface and registers an instance with
+ * the SAX2 parser using the setDocumentHandler method. The parser
* uses the instance to report basic document-related events like
* the start and end of elements and character data.</p>
*
@@ -140,7 +145,7 @@ public:
//@}
/** @name The virtual document handler interface */
-
+
//@{
/**
* Receive notification of character data.
@@ -163,7 +168,7 @@ public:
* @param length The number of characters to read from the array.
* @exception SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see #ignorableWhitespace
+ * @see #ignorableWhitespace
* @see Locator#Locator
*/
virtual void characters
@@ -202,8 +207,8 @@ public:
*/
virtual void endElement
(
- const XMLCh* const uri,
- const XMLCh* const localname,
+ const XMLCh* const uri,
+ const XMLCh* const localname,
const XMLCh* const qname
) = 0;
@@ -345,7 +350,7 @@ public:
* wrapping another exception.
*/
virtual void startPrefixMapping
- (
+ (
const XMLCh* const prefix,
const XMLCh* const uri
) = 0 ;
@@ -381,8 +386,8 @@ public:
*
* <p>Introduced with SAX2</p>
*
- * @param name The name of the skipped entity. If it is a parameter entity,
- * the name will begin with %, and if it is the external DTD subset,
+ * @param name The name of the skipped entity. If it is a parameter entity,
+ * the name will begin with %, and if it is the external DTD subset,
* it will be the string [dtd].
* @exception SAXException Any SAX exception, possibly
* wrapping another exception.
@@ -401,4 +406,6 @@ private :
void operator=(const ContentHandler&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax2/DeclHandler.hpp b/src/xercesc/sax2/DeclHandler.hpp
index 2a532caf05d2bf50623a9a93b31bfa93ea3ab027..d24736a677155a2c4b6316effd753d332e7b5653 100644
--- a/src/xercesc/sax2/DeclHandler.hpp
+++ b/src/xercesc/sax2/DeclHandler.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:09 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:55:45 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:09 peiyongz
+ * sane_include
*
* Revision 1.1 2002/01/28 17:08:33 knoaman
* SAX2-ext's DeclHandler support.
@@ -70,6 +73,7 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
/**
* Receive notification of DTD declaration events.
@@ -107,7 +111,7 @@ public:
//@}
/** @name The virtual declaration handler interface */
-
+
//@{
/**
* Report an element type declaration.
@@ -144,7 +148,7 @@ public:
* @param aName The name of the attribute.
* @param type A string representing the attribute type.
* @param mode A string representing the attribute defaulting mode ("#IMPLIED", "#REQUIRED", or "#FIXED") or null if none of these applies.
- * @param value A string representing the attribute's default value, or null if there is none.
+ * @param value A string representing the attribute's default value, or null if there is none.
* @exception SAXException Any SAX exception, possibly
* wrapping another exception.
*/
@@ -160,7 +164,7 @@ public:
/**
* Report an internal entity declaration.
*
- * <p>Only the effective (first) declaration for each entity will be
+ * <p>Only the effective (first) declaration for each entity will be
* reported. All parameter entities in the value will be expanded, but
* general entities will not.</p>
*
@@ -203,4 +207,6 @@ private :
void operator=(const DeclHandler&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax2/DefaultHandler.hpp b/src/xercesc/sax2/DefaultHandler.hpp
index 250b8a19e1a57e8aed009756ad016f79174525a1..81462d28e1599bcc62ecd619256b938faa2a958d 100644
--- a/src/xercesc/sax2/DefaultHandler.hpp
+++ b/src/xercesc/sax2/DefaultHandler.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:55:45 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/08/20 16:53:56 tng
* [Bug 6251] Info during compilation.
*
@@ -103,6 +106,8 @@
#include <xercesc/sax/ErrorHandler.hpp>
#include <xercesc/sax/SAXParseException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class Locator;
class Attributes;
@@ -866,4 +871,6 @@ inline void DefaultHandler::internalEntityDecl(const XMLCh* const,
{
}
+XERCES_CPP_NAMESPACE_END
+
#endif // ! DEFAULTHANDLER_HPP
diff --git a/src/xercesc/sax2/LexicalHandler.hpp b/src/xercesc/sax2/LexicalHandler.hpp
index 0c2e5686e79b5aeb2857f693961bbc7db8d6e91d..7c867753e9e37da846de5f35acb3c931a75edfc7 100644
--- a/src/xercesc/sax2/LexicalHandler.hpp
+++ b/src/xercesc/sax2/LexicalHandler.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:09 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:55:45 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:09 peiyongz
+ * sane_include
*
* Revision 1.1 2000/12/22 15:17:04 tng
* SAX2-ext's LexicalHandler support added by David Bertoni.
@@ -71,6 +74,7 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
/**
* Receive notification of lexical events.
@@ -106,7 +110,7 @@ public:
//@}
/** @name The virtual document handler interface */
-
+
//@{
/**
* Receive notification of comments.
@@ -213,4 +217,6 @@ private :
void operator=(const LexicalHandler&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax2/SAX2XMLReader.hpp b/src/xercesc/sax2/SAX2XMLReader.hpp
index 6cee6116b16b3bb453017bd643d4b616b3a20cd5..e51b64717de88a877b29684196e7e6cb4f52d40e 100644
--- a/src/xercesc/sax2/SAX2XMLReader.hpp
+++ b/src/xercesc/sax2/SAX2XMLReader.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2002/11/04 14:55:45 tng
+ * C++ Namespace Support.
+ *
* Revision 1.6 2002/07/11 18:29:09 knoaman
* Grammar caching/preparsing - initial implementation.
*
@@ -156,6 +159,8 @@
#include <xercesc/framework/XMLValidator.hpp>
#include <xercesc/framework/XMLPScanToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentHandler ;
class DTDHandler;
class EntityResolver;
@@ -609,7 +614,7 @@ public:
*
* @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) = 0;
//@}
@@ -983,4 +988,6 @@ private :
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax2/XMLReaderFactory.hpp b/src/xercesc/sax2/XMLReaderFactory.hpp
index 852fb9ee8aa411809880081f75e1116e36338334..6deb535feceea756c4c3c50fbfdee41c1bacf672 100644
--- a/src/xercesc/sax2/XMLReaderFactory.hpp
+++ b/src/xercesc/sax2/XMLReaderFactory.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:55:45 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/05/07 17:45:52 knoaman
* SAX2 documentation update.
*
@@ -82,6 +85,8 @@
#include <xercesc/parsers/SAX2XMLReaderImpl.hpp>
#include <xercesc/sax/SAXException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* Creates a SAX2 parser (SAX2XMLReader).
*
@@ -111,8 +116,10 @@ inline SAX2XMLReader * XMLReaderFactory::createXMLReader()
inline SAX2XMLReader * XMLReaderFactory::createXMLReader(const XMLCh * className)
{
throw SAXNotSupportedException();
- // unimplemented
+ // unimplemented
return 0;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/sax2/sax2Dummy.cpp b/src/xercesc/sax2/sax2Dummy.cpp
index 29e89456675bf8ca638c275128788f0bfa9b9ea3..db03ad6e327eece92feebc34523e119041b57120 100644
--- a/src/xercesc/sax2/sax2Dummy.cpp
+++ b/src/xercesc/sax2/sax2Dummy.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:09 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:55:45 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:09 peiyongz
+ * sane_include
*
* Revision 1.1 2000/08/02 18:02:35 jpolast
* initial checkin of sax2 implementation
@@ -73,3 +76,6 @@
#include <xercesc/sax2/ContentHandler.hpp>
#include <xercesc/sax2/DefaultHandler.hpp>
#include <xercesc/sax2/Attributes.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Compilers/BorlandCDefs.hpp b/src/xercesc/util/Compilers/BorlandCDefs.hpp
index 94c633d489ba663bc9d6261a6960fa5b02f9a160..16f1e0d7602ce47bb5457a786d0fc713261a2c87 100644
--- a/src/xercesc/util/Compilers/BorlandCDefs.hpp
+++ b/src/xercesc/util/Compilers/BorlandCDefs.hpp
@@ -61,13 +61,6 @@
#if !defined(BORLANDCDEFS_HPP)
#define BORLANDCDEFS_HPP
-// ---------------------------------------------------------------------------
-// Include some runtime files that will be needed product wide
-// ---------------------------------------------------------------------------
-#include <sys/types.h> // for size_t and ssize_t
-#include <limits.h> // for MAX of size_t and ssize_t
-
-
// ---------------------------------------------------------------------------
// The following values represent various compiler version levels stored in
// the precompiler macro __BORLANDC__, along with the associated C++Builder
@@ -85,6 +78,12 @@
// for any Borland C++Builder compiler.
// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+// Include some runtime files that will be needed product wide
+// ---------------------------------------------------------------------------
+#include <sys/types.h> // for size_t and ssize_t
+#include <limits.h> // for MAX of size_t and ssize_t
+
// ---------------------------------------------------------------------------
// A define in the build for each project is also used to control whether
// the export keyword is from the project's viewpoint or the client's.
@@ -94,15 +93,12 @@
#define PLATFORM_EXPORT __declspec(dllexport)
#define PLATFORM_IMPORT __declspec(dllimport)
-
-
// ---------------------------------------------------------------------------
// Indicate that we do not support native bools
// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
@@ -111,6 +107,11 @@
// ---------------------------------------------------------------------------
#define XML_LSTRSUPPORT
+// ---------------------------------------------------------------------------
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+// #define XERCES_HAS_CPP_NAMESPACE
// ---------------------------------------------------------------------------
// Define our version of the XML character
diff --git a/src/xercesc/util/Compilers/CSetDefs.hpp b/src/xercesc/util/Compilers/CSetDefs.hpp
index 41dc2e2f7124d2439d0237690b6c32b5134c8d82..d817db32c2d912e0efbf8ae42a54778da654f13b 100644
--- a/src/xercesc/util/Compilers/CSetDefs.hpp
+++ b/src/xercesc/util/Compilers/CSetDefs.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:45:20 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/05/28 12:57:17 tng
* Fix typo.
*
@@ -116,7 +119,10 @@
#include <limits.h> // for MAX of size_t and ssize_t
// ---------------------------------------------------------------------------
-// Define these away for this platform
+// A define in the build for each project is also used to control whether
+// the export keyword is from the project's viewpoint or the client's.
+// These defines provide the platform specific keywords that they need
+// to do this.
// ---------------------------------------------------------------------------
#define PLATFORM_EXPORT
#define PLATFORM_IMPORT
@@ -129,7 +135,6 @@
#define NO_NATIVE_BOOL
#endif
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
@@ -138,6 +143,11 @@
// ---------------------------------------------------------------------------
#define XML_LSTRSUPPORT
+// ---------------------------------------------------------------------------
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+#define XERCES_HAS_CPP_NAMESPACE
// ---------------------------------------------------------------------------
// Define our version of the XML character
diff --git a/src/xercesc/util/Compilers/CodeWarriorDefs.hpp b/src/xercesc/util/Compilers/CodeWarriorDefs.hpp
index ed6a1b1ccb81e3fe4650cbbae7b80dd0fde265d8..409dbe8f342e954cd94f934175c9735f9cc3fbec 100644
--- a/src/xercesc/util/Compilers/CodeWarriorDefs.hpp
+++ b/src/xercesc/util/Compilers/CodeWarriorDefs.hpp
@@ -68,7 +68,6 @@
//#include <limits.h> // for MAX of size_t and ssize_t
//#include <extras.h>
-
// ---------------------------------------------------------------------------
// A define in the build for each project is also used to control whether
// the export keyword is from the project's viewpoint or the client's.
@@ -78,14 +77,12 @@
#define PLATFORM_EXPORT __declspec(export)
#define PLATFORM_IMPORT __declspec(import)
-
// ---------------------------------------------------------------------------
// Indicate that we do not support native bools
// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
@@ -94,13 +91,16 @@
// ---------------------------------------------------------------------------
// #define XML_LSTRSUPPORT
+// ---------------------------------------------------------------------------
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+// #define XERCES_HAS_CPP_NAMESPACE
// ---------------------------------------------------------------------------
-// Define our version of the XMLCh.
+// Define our version of the XML character
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
-typedef unsigned short UTF16Ch;
-
// ---------------------------------------------------------------------------
// Define unsigned 16 and 32 bits integers
diff --git a/src/xercesc/util/Compilers/DECCXXDefs.hpp b/src/xercesc/util/Compilers/DECCXXDefs.hpp
index ac18176b4553a21d61469cc4cc761a4dfa4aeec0..af5bc61e3824a1c897b4776b0293d7c4881c1f05 100644
--- a/src/xercesc/util/Compilers/DECCXXDefs.hpp
+++ b/src/xercesc/util/Compilers/DECCXXDefs.hpp
@@ -68,7 +68,10 @@
#include <limits.h> // for MAX of size_t and ssize_t
// ---------------------------------------------------------------------------
-// Define these away for this platform
+// A define in the build for each project is also used to control whether
+// the export keyword is from the project's viewpoint or the client's.
+// These defines provide the platform specific keywords that they need
+// to do this.
// ---------------------------------------------------------------------------
#define PLATFORM_EXPORT
#define PLATFORM_IMPORT
@@ -79,7 +82,6 @@
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
@@ -88,6 +90,11 @@
// ---------------------------------------------------------------------------
// #define XML_LSTRSUPPORT
+// ---------------------------------------------------------------------------
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+// #define XERCES_HAS_CPP_NAMESPACE
// ---------------------------------------------------------------------------
// Define our version of the XML character
diff --git a/src/xercesc/util/Compilers/GCCDefs.hpp b/src/xercesc/util/Compilers/GCCDefs.hpp
index 6021c5f8e306dbd0f876151b198381faabe09948..fdc7fd6b8d7c38ab0488d4633649fa9b7c681d6f 100644
--- a/src/xercesc/util/Compilers/GCCDefs.hpp
+++ b/src/xercesc/util/Compilers/GCCDefs.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:45:20 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/05/28 12:57:17 tng
* Fix typo.
*
@@ -124,21 +127,21 @@
#include <sys/types.h> // for size_t and ssize_t
#include <limits.h> // for MAX of size_t and ssize_t
-
// ---------------------------------------------------------------------------
-// Define these away for this platform
+// A define in the build for each project is also used to control whether
+// the export keyword is from the project's viewpoint or the client's.
+// These defines provide the platform specific keywords that they need
+// to do this.
// ---------------------------------------------------------------------------
#define PLATFORM_EXPORT
#define PLATFORM_IMPORT
-
// ---------------------------------------------------------------------------
// Indicate that we do not support native bools
// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
@@ -147,11 +150,15 @@
// ---------------------------------------------------------------------------
// #define XML_LSTRSUPPORT
+// ---------------------------------------------------------------------------
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+#define XERCES_HAS_CPP_NAMESPACE
// ---------------------------------------------------------------------------
// Define our version of the XML character
// ---------------------------------------------------------------------------
-// typedef wchar_t XMLCh; // is another option, now considered old
typedef unsigned short XMLCh;
// ---------------------------------------------------------------------------
diff --git a/src/xercesc/util/Compilers/HPCCDefs.hpp b/src/xercesc/util/Compilers/HPCCDefs.hpp
index a185dd1590359804bbc00267681731367ef204ca..77ef476b77b0df3d9cf0cdc28c953b4193e99322 100644
--- a/src/xercesc/util/Compilers/HPCCDefs.hpp
+++ b/src/xercesc/util/Compilers/HPCCDefs.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:45:20 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/05/28 12:57:17 tng
* Fix typo.
*
@@ -122,21 +125,21 @@
#include <sys/types.h> // for size_t and ssize_t
#include <limits.h> // for MAX of size_t and ssize_t
-
// ---------------------------------------------------------------------------
-// Define these away for this platform
+// A define in the build for each project is also used to control whether
+// the export keyword is from the project's viewpoint or the client's.
+// These defines provide the platform specific keywords that they need
+// to do this.
// ---------------------------------------------------------------------------
#define PLATFORM_EXPORT
#define PLATFORM_IMPORT
-
// ---------------------------------------------------------------------------
-// Indicate that we do not support native bools
+// Indicate that we do not support native bools
// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
@@ -146,7 +149,13 @@
// #define XML_LSTRSUPPORT
// ---------------------------------------------------------------------------
-// Define our version of the XMLCh.
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+#define XERCES_HAS_CPP_NAMESPACE
+
+// ---------------------------------------------------------------------------
+// Define our version of the XML character
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
diff --git a/src/xercesc/util/Compilers/IBMVAOS2Defs.hpp b/src/xercesc/util/Compilers/IBMVAOS2Defs.hpp
index 19fb23be9b4cf0fa79365509d882090434996dc2..82e6f2b8f6fb72bfd09b1a772ad0a3b55c2959e2 100644
--- a/src/xercesc/util/Compilers/IBMVAOS2Defs.hpp
+++ b/src/xercesc/util/Compilers/IBMVAOS2Defs.hpp
@@ -62,12 +62,11 @@
#define IBMVAOS2DEFS_HPP
// ---------------------------------------------------------------------------
-// Include some common headers that are needed product wide
+// Include some runtime files that will be needed product wide
// ---------------------------------------------------------------------------
#include <sys/types.h> // for size_t and ssize_t
#include <limits.h> // for MAX of size_t and ssize_t
-
// ---------------------------------------------------------------------------
// A define in the build for each project is also used to control whether
// the export keyword is from the project's viewpoint or the client's.
@@ -77,34 +76,30 @@
#define PLATFORM_EXPORT _Export
#define PLATFORM_IMPORT
-// ---------------------------------------------------------------------------
-// Supports L"" prefixed constants. There are places
-// where it is advantageous to use the L"" where it supported, to avoid
-// unnecessary transcoding.
-// If your compiler does not support it, don't define this.
-// ---------------------------------------------------------------------------
-#define XML_LSTRSUPPORT
-
// ---------------------------------------------------------------------------
// Indicate that we do not support native bools
// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
// unnecessary transcoding.
// If your compiler does not support it, don't define this.
// ---------------------------------------------------------------------------
-// #define XML_LSTRSUPPORT
+#define XML_LSTRSUPPORT
+
+// ---------------------------------------------------------------------------
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+// #define XERCES_HAS_CPP_NAMESPACE
// ---------------------------------------------------------------------------
-// Define our version of the XMLCh.
+// Define our version of the XML character
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
-// typedef wchar_t XMLCh;
// ---------------------------------------------------------------------------
// Define unsigned 16 and 32 bits integers
diff --git a/src/xercesc/util/Compilers/IBMVAW32Defs.hpp b/src/xercesc/util/Compilers/IBMVAW32Defs.hpp
index 8831cc8c16f72f7c3b394b83b848bf90822aafa0..223a7454e3b8bdf7681b487d832e6b3b727a7b71 100644
--- a/src/xercesc/util/Compilers/IBMVAW32Defs.hpp
+++ b/src/xercesc/util/Compilers/IBMVAW32Defs.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:45:20 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/05/28 12:57:17 tng
* Fix typo.
*
@@ -111,7 +114,6 @@
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
@@ -121,7 +123,13 @@
// #define XML_LSTRSUPPORT
// ---------------------------------------------------------------------------
-// Define our version of the XMLCh.
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+// #define XERCES_HAS_CPP_NAMESPACE
+
+// ---------------------------------------------------------------------------
+// Define our version of the XML character
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
diff --git a/src/xercesc/util/Compilers/MIPSproDefs.hpp b/src/xercesc/util/Compilers/MIPSproDefs.hpp
index 93265935ed8d54d6ca919c9a0e364d11dd688f1b..83f48f2321e0a9ab2e92852f47f89d97813faa9f 100644
--- a/src/xercesc/util/Compilers/MIPSproDefs.hpp
+++ b/src/xercesc/util/Compilers/MIPSproDefs.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:45:20 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/05/28 12:57:17 tng
* Fix typo.
*
@@ -103,21 +106,21 @@
#include <sys/types.h> // for size_t and ssize_t
#include <limits.h> // for MAX of size_t and ssize_t
-
// ---------------------------------------------------------------------------
-// Define these away for this platform
+// A define in the build for each project is also used to control whether
+// the export keyword is from the project's viewpoint or the client's.
+// These defines provide the platform specific keywords that they need
+// to do this.
// ---------------------------------------------------------------------------
#define PLATFORM_EXPORT
#define PLATFORM_IMPORT
-
// ---------------------------------------------------------------------------
// Indicate that we do not support native bools
// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
@@ -126,12 +129,16 @@
// ---------------------------------------------------------------------------
// #define XML_LSTRSUPPORT
+// ---------------------------------------------------------------------------
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+// #define XERCES_HAS_CPP_NAMESPACE
+
// ---------------------------------------------------------------------------
// Define our version of the XML character
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
-typedef unsigned short UTF16Ch;
-
// ---------------------------------------------------------------------------
// Define unsigned 16 and 32 bits integers
diff --git a/src/xercesc/util/Compilers/MVSCPPDefs.hpp b/src/xercesc/util/Compilers/MVSCPPDefs.hpp
index 0f927bbb600e573d8ab42a09fff980c5355e2c69..35d76f1548f9dd516bce19cce2d6ec21664a5d6e 100644
--- a/src/xercesc/util/Compilers/MVSCPPDefs.hpp
+++ b/src/xercesc/util/Compilers/MVSCPPDefs.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2002/11/04 14:45:20 tng
+ * C++ Namespace Support.
+ *
* Revision 1.5 2002/08/08 16:40:16 tng
* 390 Changes from Stephen Dulin.
*
@@ -125,7 +128,10 @@
#include <limits.h> // for MAX of size_t and ssize_t
// ---------------------------------------------------------------------------
-// Define these away for this platform
+// A define in the build for each project is also used to control whether
+// the export keyword is from the project's viewpoint or the client's.
+// These defines provide the platform specific keywords that they need
+// to do this.
// ---------------------------------------------------------------------------
#define PLATFORM_EXPORT _Export
#define PLATFORM_IMPORT _Export
@@ -136,7 +142,6 @@
// ---------------------------------------------------------------------------
//#define NO_NATIVE_BOOL
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
@@ -145,6 +150,12 @@
// ---------------------------------------------------------------------------
#define XML_LSTRSUPPORT
+// ---------------------------------------------------------------------------
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+// #define XERCES_HAS_CPP_NAMESPACE
+
// ---------------------------------------------------------------------------
// Define our version of the XML character
// ---------------------------------------------------------------------------
diff --git a/src/xercesc/util/Compilers/OS400SetDefs.hpp b/src/xercesc/util/Compilers/OS400SetDefs.hpp
index 9c31145f79cb90cad0c3776d4bf0151934a0bfdc..936c949596112c43ad17b68ff7a7a0b23ab6b941 100644
--- a/src/xercesc/util/Compilers/OS400SetDefs.hpp
+++ b/src/xercesc/util/Compilers/OS400SetDefs.hpp
@@ -69,21 +69,22 @@
#include <limits.h> // for MAX of size_t and ssize_t
// ---------------------------------------------------------------------------
-// Define these away for this platform
+// A define in the build for each project is also used to control whether
+// the export keyword is from the project's viewpoint or the client's.
+// These defines provide the platform specific keywords that they need
+// to do this.
// ---------------------------------------------------------------------------
#define PLATFORM_EXPORT
#define PLATFORM_IMPORT
-
// ---------------------------------------------------------------------------
-// Indicate that we do not support native bools
+// Indicate that we do not support native bools
// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
#if !defined(__BOOL__)
#define NO_NATIVE_BOOL
#endif
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
@@ -92,12 +93,17 @@
// ---------------------------------------------------------------------------
// #define XML_LSTRSUPPORT
+// ---------------------------------------------------------------------------
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+// #define XERCES_HAS_CPP_NAMESPACE
+
// ---------------------------------------------------------------------------
// Define our version of the XML character
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
-
// ---------------------------------------------------------------------------
// Define unsigned 16 and 32 bits integers
// ---------------------------------------------------------------------------
diff --git a/src/xercesc/util/Compilers/PTXCCDefs.hpp b/src/xercesc/util/Compilers/PTXCCDefs.hpp
index f3df9cd7fe4b3188020b7fcae6d3b00179461967..94e335a71c2292697b6d9ad033a0925f43a73a63 100644
--- a/src/xercesc/util/Compilers/PTXCCDefs.hpp
+++ b/src/xercesc/util/Compilers/PTXCCDefs.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:45:20 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/05/28 12:57:17 tng
* Fix typo.
*
@@ -87,19 +90,20 @@
#include <limits.h> // for MAX of size_t and ssize_t
// ---------------------------------------------------------------------------
-// Define these away for this platform
+// A define in the build for each project is also used to control whether
+// the export keyword is from the project's viewpoint or the client's.
+// These defines provide the platform specific keywords that they need
+// to do this.
// ---------------------------------------------------------------------------
#define PLATFORM_EXPORT
#define PLATFORM_IMPORT
-
// ---------------------------------------------------------------------------
-// Indicate that we do not support native bools
+// Indicate that we do not support native bools
// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
@@ -108,6 +112,12 @@
// ---------------------------------------------------------------------------
// #define XML_LSTRSUPPORT
+// ---------------------------------------------------------------------------
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+// #define XERCES_HAS_CPP_NAMESPACE
+
// ---------------------------------------------------------------------------
// Define our version of the XML character
// ---------------------------------------------------------------------------
diff --git a/src/xercesc/util/Compilers/SCOCCDefs.hpp b/src/xercesc/util/Compilers/SCOCCDefs.hpp
index 33c327c6c49b92b010e78e85bf3ab4b7441aa38b..fb5a7045bbe07e450446a06bc5ea433a4dd11e78 100644
--- a/src/xercesc/util/Compilers/SCOCCDefs.hpp
+++ b/src/xercesc/util/Compilers/SCOCCDefs.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:45:20 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/05/28 12:57:17 tng
* Fix typo.
*
@@ -92,21 +95,21 @@
#include <sys/types.h> // for size_t and ssize_t
#include <limits.h> // for MAX of size_t and ssize_t
-
// ---------------------------------------------------------------------------
-// Define these away for this platform
+// A define in the build for each project is also used to control whether
+// the export keyword is from the project's viewpoint or the client's.
+// These defines provide the platform specific keywords that they need
+// to do this.
// ---------------------------------------------------------------------------
#define PLATFORM_EXPORT
#define PLATFORM_IMPORT
-
// ---------------------------------------------------------------------------
-// Indicate that we do not support native bools
+// Indicate that we do not support native bools
// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
@@ -116,7 +119,13 @@
// #define XML_LSTRSUPPORT
// ---------------------------------------------------------------------------
-// Define our version of the XMLCh.
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+// #define XERCES_HAS_CPP_NAMESPACE
+
+// ---------------------------------------------------------------------------
+// Define our version of the XML character
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
diff --git a/src/xercesc/util/Compilers/SunCCDefs.hpp b/src/xercesc/util/Compilers/SunCCDefs.hpp
index 5f4eba38321be30169179c065fce137919613053..6989ba309d5825c6dffa22fc9663d395cc49d2f7 100644
--- a/src/xercesc/util/Compilers/SunCCDefs.hpp
+++ b/src/xercesc/util/Compilers/SunCCDefs.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:45:20 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/05/28 12:57:17 tng
* Fix typo.
*
@@ -124,12 +127,14 @@
#include <limits.h> // for MAX of size_t and ssize_t
// ---------------------------------------------------------------------------
-// Define these away for this platform
+// A define in the build for each project is also used to control whether
+// the export keyword is from the project's viewpoint or the client's.
+// These defines provide the platform specific keywords that they need
+// to do this.
// ---------------------------------------------------------------------------
#define PLATFORM_EXPORT
#define PLATFORM_IMPORT
-
// ---------------------------------------------------------------------------
// Indicate that we do not support native bools
// If the compiler can handle boolean itself, do not define it
@@ -138,7 +143,6 @@
#define NO_NATIVE_BOOL
#endif
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
@@ -147,13 +151,17 @@
// ---------------------------------------------------------------------------
// #define XML_LSTRSUPPORT
+// ---------------------------------------------------------------------------
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+#define XERCES_HAS_CPP_NAMESPACE
// ---------------------------------------------------------------------------
// Define our version of the XML character
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
-
// ---------------------------------------------------------------------------
// Define unsigned 16 and 32 bits integers
// ---------------------------------------------------------------------------
diff --git a/src/xercesc/util/Compilers/SunKaiDefs.hpp b/src/xercesc/util/Compilers/SunKaiDefs.hpp
index 46f6960b67800b02df7fa489120ff11dea57e509..ee50a09e0c5fcd8e89aa96cdb413aca7b8d71525 100644
--- a/src/xercesc/util/Compilers/SunKaiDefs.hpp
+++ b/src/xercesc/util/Compilers/SunKaiDefs.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:45:20 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/05/28 12:57:17 tng
* Fix typo.
*
@@ -99,7 +102,6 @@
#include <sys/types.h> // for size_t and ssize_t
#include <limits.h> // for MAX of size_t and ssize_t
-
// ---------------------------------------------------------------------------
// A define in the build for each project is also used to control whether
// the export keyword is from the project's viewpoint or the client's.
@@ -109,14 +111,12 @@
#define PLATFORM_EXPORT
#define PLATFORM_IMPORT
-
// ---------------------------------------------------------------------------
// Indicate that we do not support native bools
// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
@@ -125,9 +125,14 @@
// ---------------------------------------------------------------------------
// #define XML_LSTRSUPPORT
+// ---------------------------------------------------------------------------
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+// #define XERCES_HAS_CPP_NAMESPACE
// ---------------------------------------------------------------------------
-// Define our version of the XMLCh.
+// Define our version of the XML character
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
diff --git a/src/xercesc/util/Compilers/TandemCCDefs.hpp b/src/xercesc/util/Compilers/TandemCCDefs.hpp
index 99b3eca2e3154047ca22ddec15a61b50990dbfb2..1c13b77ee5bd0df7c69cb43b06ef269d11a1f295 100644
--- a/src/xercesc/util/Compilers/TandemCCDefs.hpp
+++ b/src/xercesc/util/Compilers/TandemCCDefs.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:45:20 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/05/28 12:57:17 tng
* Fix typo.
*
@@ -100,19 +103,20 @@
#include <limits.h> // for MAX of size_t and ssize_t
// ---------------------------------------------------------------------------
-// Define these away for this platform
+// A define in the build for each project is also used to control whether
+// the export keyword is from the project's viewpoint or the client's.
+// These defines provide the platform specific keywords that they need
+// to do this.
// ---------------------------------------------------------------------------
#define PLATFORM_EXPORT
#define PLATFORM_IMPORT
-
// ---------------------------------------------------------------------------
-// Indicate that we do not support native bools
+// Indicate that we do not support native bools
// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
@@ -122,7 +126,13 @@
// #define XML_LSTRSUPPORT
// ---------------------------------------------------------------------------
-// Define our version of the XMLCh.
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+// #define XERCES_HAS_CPP_NAMESPACE
+
+// ---------------------------------------------------------------------------
+// Define our version of the XML character
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
diff --git a/src/xercesc/util/Compilers/VCPPDefs.hpp b/src/xercesc/util/Compilers/VCPPDefs.hpp
index 71912315fc6c4388af3f68b0deb94a010ad18b2e..080e76e119fc71c21d60985b1ccc8971b2922f52 100644
--- a/src/xercesc/util/Compilers/VCPPDefs.hpp
+++ b/src/xercesc/util/Compilers/VCPPDefs.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2002/11/04 14:45:20 tng
+ * C++ Namespace Support.
+ *
* Revision 1.6 2002/06/25 16:05:24 tng
* DOM L3: move the operator delete to DOMDocumentImpl.hpp
*
@@ -134,7 +137,6 @@
#include <sys/types.h> // for size_t and ssize_t
#include <limits.h> // for MAX of size_t and ssize_t
-
// ---------------------------------------------------------------------------
// A define in the build for each project is also used to control whether
// the export keyword is from the project's viewpoint or the client's.
@@ -144,14 +146,12 @@
#define PLATFORM_EXPORT __declspec(dllexport)
#define PLATFORM_IMPORT __declspec(dllimport)
-
// ---------------------------------------------------------------------------
// Indicate that we do not support native bools
// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
-
// ---------------------------------------------------------------------------
// Each compiler might support L"" prefixed constants. There are places
// where it is advantageous to use the L"" where it supported, to avoid
@@ -160,15 +160,17 @@
// ---------------------------------------------------------------------------
#define XML_LSTRSUPPORT
+// ---------------------------------------------------------------------------
+// Indicate that we support C++ namespace
+// Do not define it if the compile cannot handle C++ namespace
+// ---------------------------------------------------------------------------
+#define XERCES_HAS_CPP_NAMESPACE
// ---------------------------------------------------------------------------
-// Define our version of the XMLCh. XMLCh should be mapped to the native
-// wide char type (whatever wchar_t is.) In VC++, wchar_t is not an
-// intrinsic type and is just mapped to unsigned short.
+// Define our version of the XML character
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
-
// ---------------------------------------------------------------------------
// Define unsigned 16 and 32 bits integers
// ---------------------------------------------------------------------------
diff --git a/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp b/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp
index 627f179f8fa6ad53c4feca4c11e4d7e27f4e06d8..0bccdb9f8537db86c27a061f52a36d603b8ffaf7 100644
--- a/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp
+++ b/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 15:10:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/10/10 21:07:55 peiyongz
* load resource files using environement vars and base name
*
@@ -115,6 +118,8 @@
#include <stdio.h>
#include <stdlib.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Local static methods
// ---------------------------------------------------------------------------
@@ -122,7 +127,7 @@
// ---------------------------------------------------------------------------
// Public Constructors and Destructor
// ---------------------------------------------------------------------------
-ICUMsgLoader::ICUMsgLoader(const XMLCh* const msgDomain)
+ICUMsgLoader::ICUMsgLoader(const XMLCh* const msgDomain)
:fLocaleBundle(0)
,fDomainBundle(0)
{
@@ -140,7 +145,7 @@ ICUMsgLoader::ICUMsgLoader(const XMLCh* const msgDomain)
if (location)
strcpy(tempBuf, location);
-
+
strcat(tempBuf, U_FILE_SEP_STRING);
strcat(tempBuf, "XercescErrMsg");
@@ -150,7 +155,7 @@ ICUMsgLoader::ICUMsgLoader(const XMLCh* const msgDomain)
{
XMLPlatformUtils::panic(XMLPlatformUtils::Panic_CantLoadMsgDomain);
}
-
+
/***
get the resource bundle for the domain
strip off path information, if any
@@ -160,7 +165,7 @@ ICUMsgLoader::ICUMsgLoader(const XMLCh* const msgDomain)
err = U_ZERO_ERROR;
fDomainBundle = ures_getByKey(fLocaleBundle, domainName, NULL, &err);
delete [] domainName;
-
+
if (!U_SUCCESS(err) || fDomainBundle == NULL)
{
XMLPlatformUtils::panic(XMLPlatformUtils::Panic_CantLoadMsgDomain);
@@ -273,3 +278,5 @@ bool ICUMsgLoader::loadMsg( const XMLMsgLoader::XMLMsgId msgToLoad
return bRet;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp b/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp
index 1b58e3d252d86eb3799d765cbcd4cab2cdc46bf6..48228cb68e3e03c292a6ed008511681e6fc078e3 100644
--- a/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp
+++ b/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:10:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/10/10 21:07:55 peiyongz
* load resource files using environement vars and base name
*
@@ -99,6 +102,7 @@
#include <xercesc/util/XMLMsgLoader.hpp>
#include "unicode/ures.h"
+XERCES_CPP_NAMESPACE_BEGIN
//
// This is the ICU specific implementation of the XMLMsgLoader interface.
@@ -165,7 +169,7 @@ private :
// locale specific resource bundle unavailable.
//
// fDomainBundle
- // pointer to the domain specific resource bundle with in the
+ // pointer to the domain specific resource bundle with in the
// required locale specific (or default locale) resource bundle.
//
// -----------------------------------------------------------------------
@@ -173,4 +177,6 @@ private :
UResourceBundle* fDomainBundle;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/util/MsgLoaders/InMemory/CppErrMsgs_EN_US.hpp b/src/xercesc/util/MsgLoaders/InMemory/CppErrMsgs_EN_US.hpp
index 58c30c0a75e1bd53ee41e6dc8b6ec1363c65b370..13fc1c4b253e98888558478d5e7c4b65faa669a7 100644
--- a/src/xercesc/util/MsgLoaders/InMemory/CppErrMsgs_EN_US.hpp
+++ b/src/xercesc/util/MsgLoaders/InMemory/CppErrMsgs_EN_US.hpp
@@ -3,6 +3,10 @@
// so do not edit this file directly!!
// ----------------------------------------------------------------
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
const XMLCh gXMLErrArray[][128] =
{
{ 0x0057,0x005F,0x0053,0x0074,0x0061,0x0072,0x0074,0x00 }
@@ -1506,3 +1510,5 @@ const XMLCh gXMLExceptArray[][128] =
};
const unsigned int gXMLExceptArraySize = 360;
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp b/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp
index a3c1e43485e8bc157a669f83b41ddd6b57837776..d008d9395682fa77a48964dc29ae543a97370840 100644
--- a/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp
+++ b/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:10:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/24 19:57:59 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -101,7 +104,7 @@
#include "InMemMsgLoader.hpp"
#include "CppErrMsgs_EN_US.hpp"
-
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Public Constructors and Destructor
@@ -233,3 +236,5 @@ bool InMemMsgLoader::loadMsg(const XMLMsgLoader::XMLMsgId msgToLoad
return bRet;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp b/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp
index e7d660ab93fac7e954e6b697f09f09fbb0816d62..b74c745796053f64ccaddfdea526fe30f1484901 100644
--- a/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp
+++ b/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:21 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:10:40 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:21 peiyongz
+ * sane_include
*
* Revision 1.4 2000/03/28 19:43:21 roddey
* Fixes for signed/unsigned warnings. New work for two way transcoding
@@ -86,6 +89,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLMsgLoader.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This is a simple in memory message loader implementation. For those
// folks who just want a single language and want something very fast and
@@ -153,4 +158,6 @@ private :
XMLCh* fMsgDomain;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp b/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp
index 3653c036c0bc3ec378aa0782afb36f9913ade8b3..bcb0692bb47a5a4023354a707f0678eec1f2db18 100644
--- a/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp
+++ b/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 15:10:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/09/24 19:58:33 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -114,6 +117,8 @@
#include <stdio.h>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Public Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -243,3 +248,5 @@ bool MsgCatalogLoader::loadMsg(const XMLMsgLoader::XMLMsgId msgToLoad
return bRet;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.hpp b/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.hpp
index c22bfd1a1b0c4105a20b13b3fd0d97afeacd83ad..0aa7dc4bbac73e013686d3f69f66826f86d3347e 100644
--- a/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.hpp
+++ b/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:10:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/23 21:03:06 peiyongz
* Build MsgCatalog on Solaris
*
@@ -86,6 +89,8 @@
#include <nl_types.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This is a simple in Iconv RC message loader implementation.
//
@@ -157,4 +162,6 @@ private :
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/util/MsgLoaders/MsgCatalog/XMLMsgCat_Ids.hpp b/src/xercesc/util/MsgLoaders/MsgCatalog/XMLMsgCat_Ids.hpp
index d9dbca265075e54fc5e1ae59fe0547fb14baa76f..d4ea02d7028115b8548ca0c33d0f156eddb728a7 100644
--- a/src/xercesc/util/MsgLoaders/MsgCatalog/XMLMsgCat_Ids.hpp
+++ b/src/xercesc/util/MsgLoaders/MsgCatalog/XMLMsgCat_Ids.hpp
@@ -1,3 +1,15 @@
+// ----------------------------------------------------------------
+// This file was generated from the XML error message source.
+// so do not edit this file directly!!
+// ----------------------------------------------------------------
+
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
const unsigned int CatId_XMLErrs = 1;
const unsigned int CatId_XMLValid = 2;
const unsigned int CatId_XMLExcepts = 3;
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/util/MsgLoaders/MsgFile/MsgLoader.cpp b/src/xercesc/util/MsgLoaders/MsgFile/MsgLoader.cpp
index 289434c85f0a401b9bd4311f5489a34840a131bd..3dad2e94fa7bdeaab8d2a93f43957af05d189ab7 100644
--- a/src/xercesc/util/MsgLoaders/MsgFile/MsgLoader.cpp
+++ b/src/xercesc/util/MsgLoaders/MsgFile/MsgLoader.cpp
@@ -75,6 +75,7 @@
#include <qmhrtvm.h>
#include <qusec.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Public Constructors and Destructor
@@ -294,3 +295,5 @@ bool MsgCatalogLoader::loadMsg(const XMLMsgLoader::XMLMsgId msgToLoad
return bRet;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/MsgLoaders/MsgFile/MsgLoader.hpp b/src/xercesc/util/MsgLoaders/MsgFile/MsgLoader.hpp
index 13f65e4293857664155f7f0775367651329651a9..7d5b2a492eab29a0a3b265e1fe6e177ab596def6 100644
--- a/src/xercesc/util/MsgLoaders/MsgFile/MsgLoader.hpp
+++ b/src/xercesc/util/MsgLoaders/MsgFile/MsgLoader.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -64,7 +64,9 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLMsgLoader.hpp>
-#include <nl_types.h>
+#include <nl_types.h>
+
+XERCES_CPP_NAMESPACE_BEGIN
//
// This is a simple in Iconv RC message loader implementation.
@@ -136,4 +138,6 @@ private :
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/util/MsgLoaders/MsgFile/XMLMessages.h b/src/xercesc/util/MsgLoaders/MsgFile/XMLMessages.h
index 1997d36e506914bf2a3ba805b4be63a0e2e3325f..75b4961d418bfd2d6b86573aca1bd4e91a109b00 100644
--- a/src/xercesc/util/MsgLoaders/MsgFile/XMLMessages.h
+++ b/src/xercesc/util/MsgLoaders/MsgFile/XMLMessages.h
@@ -1,6 +1,10 @@
#ifndef XML_ERROR_MESSAGES_H
#define XML_ERROR_MESSAGES_H
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
// These are Fatal error messages
#define E_ExpectedCommentOrCDATA "XMLBE00"
@@ -177,7 +181,7 @@
#define Mutex_CouldNotClose "XMLBE9C"
#define Mutex_CouldNotLock "XMLBE9D"
#define Mutex_CouldNotUnlock "XMLBE9E"
-#define Mutex_CouldNotDestroy "XMLBE9F"
+#define Mutex_CouldNotDestroy "XMLBE9F"
#define Pool_ElemAlreadyExists "XMLBEA0"
#define Pool_BadHashFromKey "XMLBEA1"
#define Pool_InvalidId "XMLBEA2"
@@ -231,7 +235,7 @@
#define Val_InvalidElemId "XMLBED2"
// These are the new messages for 3.0 code base
-// Note ALL CAPITALIZED DEFINES ARE AS/400 UNIQUE MESSAGES
+// Note ALL CAPITALIZED DEFINES ARE AS/400 UNIQUE MESSAGES
#define FILE_OPEN_PROBLEMS "XMLBED3"
#define ICONV_CONVERT_PROBLEM "XMLBED4"
#define ICONV_CCSID_PROBLEM "XMLBED5"
@@ -488,7 +492,7 @@ char Exceptions[][8]= {
Reader_EOIInMultiSeq,
Reader_BadUTF8Seq,
Reader_BadSurrogateInUTF8,
- Reader_SrcOfsNotSupported,
+ Reader_SrcOfsNotSupported,
Scan_CouldNotOpenSource,
Scan_UnbalancedStartEnd,
Scan_BadPScanToken,
@@ -504,9 +508,9 @@ char Exceptions[][8]= {
StrPool_IllegalId,
Trans_CouldNotXCodeXMLData,
Trans_CouldNotCreateDefCvtr,
- Trans_InvalidSizeReq,
- Trans_Unrepresentable,
- Trans_NotInSourceSet,
+ Trans_InvalidSizeReq,
+ Trans_Unrepresentable,
+ Trans_NotInSourceSet,
URL_MalformedURL,
URL_UnsupportedProto,
URL_UnsupportedProto1,
@@ -521,10 +525,8 @@ char Exceptions[][8]= {
XMLRec_UnknownEncoding
};
-#endif
-
-
-
+XERCES_CPP_NAMESPACE_END
+#endif
diff --git a/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp b/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp
index 72300a7499b174045b4aff77bebd57c9aa4918a8..a91f1e044f864abcb1a4357413b0ecad6d691b5f 100644
--- a/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp
+++ b/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp
@@ -70,6 +70,8 @@
#include <windows.h>
#include "Win32MsgLoader.hpp"
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Public Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -267,3 +269,5 @@ bool Win32MsgLoader::loadMsg(const XMLMsgLoader::XMLMsgId msgToLoad
return bRet;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.hpp b/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.hpp
index 7c5f92afcae1025d842f28f741e38c876324de60..299eace598e51a241dd55e02c0a91460ba7d1d92 100644
--- a/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.hpp
+++ b/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:22 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:10:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:22 peiyongz
+ * sane_include
*
* Revision 1.4 2000/03/28 19:43:23 roddey
* Fixes for signed/unsigned warnings. New work for two way transcoding
@@ -86,6 +89,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLMsgLoader.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This is a simple in Win32 RC message loader implementation.
//
@@ -163,4 +168,6 @@ private :
XMLCh* fMsgDomain;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/util/NetAccessors/MacOSURLAccess/MacOSURLAccess.cpp b/src/xercesc/util/NetAccessors/MacOSURLAccess/MacOSURLAccess.cpp
index fac144566d14a76766c236e78946fd8b641adadd..428ede31e3e95012bbaf85267154e3aa7778f619 100644
--- a/src/xercesc/util/NetAccessors/MacOSURLAccess/MacOSURLAccess.cpp
+++ b/src/xercesc/util/NetAccessors/MacOSURLAccess/MacOSURLAccess.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -69,6 +69,7 @@
#include <xercesc/util/NetAccessors/MacOSURLAccess/MacOSURLAccess.hpp>
#include <xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
const XMLCh
MacOSURLAccess::sMyID[] =
@@ -104,3 +105,5 @@ MacOSURLAccess::makeNew(const XMLURL& urlSource)
return result;
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/util/NetAccessors/MacOSURLAccess/MacOSURLAccess.hpp b/src/xercesc/util/NetAccessors/MacOSURLAccess/MacOSURLAccess.hpp
index 75c3829027db56838226cd09684992c92b4249c0..9b672a6f4cd0289b939ada58a6ae4ce63f544a3d 100644
--- a/src/xercesc/util/NetAccessors/MacOSURLAccess/MacOSURLAccess.hpp
+++ b/src/xercesc/util/NetAccessors/MacOSURLAccess/MacOSURLAccess.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -71,10 +71,11 @@
#include <xercesc/util/BinInputStream.hpp>
#include <xercesc/util/XMLNetAccessor.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
//
// This class is the wrapper for the Mac OS URLAccess code
-// which provides access to network resources.
+// which provides access to network resources.
// It's being used here to add the ability to
// use HTTP URL's as the system id's in the XML decl clauses.
//
@@ -103,6 +104,7 @@ MacOSURLAccess::getId() const
}
+XERCES_CPP_NAMESPACE_END
#endif // MACOSURLACCESS_HPP
diff --git a/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.cpp b/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.cpp
index 89ff08bc69f3e0aeccb5a7d36f7d82e69c0f4ca0..ddf94aa8baed32ed73ffa5a1d33f7ac4a0d036a2 100644
--- a/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.cpp
+++ b/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -71,6 +71,7 @@
#include <cstdlib>
#include <cstring>
+XERCES_CPP_NAMESPACE_BEGIN
URLAccessBinInputStream::URLAccessBinInputStream(const XMLURL& urlSource)
: mBytesProcessed(0),
@@ -232,3 +233,5 @@ URLAccessBinInputStream::readBytes(XMLByte* const toFill
// Return number of bytes delivered
return maxToRead - bytesDesired;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.hpp b/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.hpp
index ce2d84f6fcc2cbbd8f412a956133410daf6e47a3..6bcec908667e0e0feb03e586b1092cfa0b8382ec 100644
--- a/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.hpp
+++ b/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -77,6 +77,7 @@
#include <URLAccess.h>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
//
// This class implements the BinInputStream interface specified by the XML
@@ -112,6 +113,6 @@ URLAccessBinInputStream::curPos() const
return mBytesProcessed;
}
-
+XERCES_CPP_NAMESPACE_END
#endif // URLACCESSBININPUTSTREAM_HPP
diff --git a/src/xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.cpp b/src/xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.cpp
index 7afbff13399c65588cec821daa262950aaa0f3bd..fbbfa750f3f99fe6df69c24b2303f384448f0b70 100644
--- a/src/xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.cpp
+++ b/src/xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -69,6 +69,7 @@
#include <xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.hpp>
#include <xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
const XMLCh
MacOSURLAccessCF::sMyID[] =
@@ -97,3 +98,5 @@ MacOSURLAccessCF::makeNew(const XMLURL& urlSource)
return result;
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.hpp b/src/xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.hpp
index 0d11577877ae34f6278c38a855a3009f06898f33..1a6e40a7fffa535134ded202605d8c5379059cfa 100644
--- a/src/xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.hpp
+++ b/src/xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*
* Written by James D. Berry, Critical Path Software, Inc., 2002-02-17
- *
+ *
*/
/*
@@ -71,6 +71,7 @@
#include <xercesc/util/BinInputStream.hpp>
#include <xercesc/util/XMLNetAccessor.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
//
// This class is the wrapper for the Mac OS CFURLAccess code
@@ -103,6 +104,6 @@ MacOSURLAccessCF::getId() const
}
-
+XERCES_CPP_NAMESPACE_END
#endif // MACOSURLACCESSCF_HPP
diff --git a/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.cpp b/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.cpp
index f94a980985cf32270421d44be1f353b6179c4ecd..9747ed8098db62226e38fc2c03934fb0b6314f92 100644
--- a/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.cpp
+++ b/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -70,6 +70,7 @@
#include <cstdlib>
#include <cstring>
+XERCES_CPP_NAMESPACE_BEGIN
URLAccessCFBinInputStream::URLAccessCFBinInputStream(const XMLURL& urlSource)
: mBytesProcessed(0),
@@ -78,7 +79,7 @@ URLAccessCFBinInputStream::URLAccessCFBinInputStream(const XMLURL& urlSource)
// Figure out what we're dealing with
const XMLCh* urlText = urlSource.getURLText();
unsigned int urlLength = XMLString::stringLen(urlText);
-
+
// Create a CFString from the path
CFStringRef stringRef = NULL;
if (urlText)
@@ -89,18 +90,18 @@ URLAccessCFBinInputStream::URLAccessCFBinInputStream(const XMLURL& urlSource)
urlLength
);
}
-
+
// Create a URLRef from the CFString
CFURLRef urlRef = NULL;
if (stringRef)
{
urlRef = CFURLCreateWithString(
- kCFAllocatorDefault,
- stringRef,
+ kCFAllocatorDefault,
+ stringRef,
NULL // CFURLRef baseURL
);
}
-
+
// Fetch the data
mDataRef = NULL;
SInt32 errorCode = 0;
@@ -116,13 +117,13 @@ URLAccessCFBinInputStream::URLAccessCFBinInputStream(const XMLURL& urlSource)
&errorCode
);
}
-
+
// Cleanup temporary stuff
if (stringRef)
CFRelease(stringRef);
if (urlRef)
CFRelease(urlRef);
-
+
// Check for an error in fetching the data
if (!success || errorCode)
{
@@ -132,28 +133,28 @@ URLAccessCFBinInputStream::URLAccessCFBinInputStream(const XMLURL& urlSource)
CFRelease(mDataRef);
mDataRef = NULL;
}
-
+
// Do a best attempt at mapping some errors
switch (errorCode)
{
case kCFURLUnknownSchemeError:
ThrowXML(MalformedURLException, XMLExcepts::URL_UnsupportedProto);
break;
-
+
case kCFURLRemoteHostUnavailableError:
ThrowXML(NetAccessorException, XMLExcepts::NetAcc_TargetResolution);
break;
-
+
case kCFURLUnknownError:
ThrowXML(NetAccessorException, XMLExcepts::NetAcc_ReadSocket);
break;
-
+
case kCFURLResourceNotFoundError:
case kCFURLResourceAccessViolationError:
case kCFURLTimeoutError:
ThrowXML(NetAccessorException, XMLExcepts::File_CouldNotOpenFile);
break;
-
+
case kCFURLImproperArgumentsError:
case kCFURLUnknownPropertyKeyError:
case kCFURLPropertyKeyUnavailableError:
@@ -184,24 +185,26 @@ URLAccessCFBinInputStream::readBytes(XMLByte* const toFill
// If we don't have a dataRef, we can't return any data
if (!mDataRef)
return 0;
-
+
// Get the length of the data we've fetched
CFIndex dataLength = CFDataGetLength(mDataRef);
-
+
// Calculate how much to return based on how much
// we've already returned, and how much the user wants
CFIndex n = dataLength - mBytesProcessed; // Amount remaining
CFIndex desired = maxToRead & 0x7fffffff; // CFIndex is signed
if (n > desired) // Amount desired
n = desired;
-
+
// Read the appropriate bytes into the user buffer
CFRange range = CFRangeMake(mBytesProcessed, n);
CFDataGetBytes(mDataRef, range, reinterpret_cast<UInt8*>(toFill));
// Update bytes processed
mBytesProcessed += n;
-
+
// Return the number of bytes delivered
return n;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp b/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp
index 64e8255c19b50cf49ba6dc456f3c3ed5138f14a8..826b8bb58ee6f2b25e1435876ea9562340378aa2 100644
--- a/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp
+++ b/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -69,6 +69,8 @@
#include <xercesc/util/XMLExceptMsgs.hpp>
#include <xercesc/util/BinInputStream.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
#if defined(__APPLE__)
// Framework includes from ProjectBuilder
#include <CoreServices/CoreServices.h>
@@ -110,6 +112,6 @@ URLAccessCFBinInputStream::curPos() const
return mBytesProcessed;
}
-
+XERCES_CPP_NAMESPACE_END
#endif // URLACCESSCFBININPUTSTREAM_HPP
diff --git a/src/xercesc/util/NetAccessors/Socket/SocketNetAccessor.cpp b/src/xercesc/util/NetAccessors/Socket/SocketNetAccessor.cpp
index 1be793b12e1f5143464d652ffafac0299599b8cb..845eebec6224cefdf339454070f91ee8ce12d3bd 100644
--- a/src/xercesc/util/NetAccessors/Socket/SocketNetAccessor.cpp
+++ b/src/xercesc/util/NetAccessors/Socket/SocketNetAccessor.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -65,6 +65,7 @@
#include <xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.hpp>
#include <xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
const XMLCh SocketNetAccessor::fgMyName[] =
{
@@ -111,3 +112,5 @@ BinInputStream* SocketNetAccessor::makeNew(const XMLURL& urlSource)
return 0;
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp b/src/xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp
index 58053131e48fb2894e6d53f791271d7d556ecf5f..2837621cf8cdfd8f94e05627ef7bc6e8b77cfb06 100644
--- a/src/xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp
+++ b/src/xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:23 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:11:38 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:23 peiyongz
+ * sane_include
*
* Revision 1.1 2000/03/20 23:48:51 rahulj
* Added Socket based NetAccessor. This will enable one to
@@ -80,6 +83,7 @@
#include <xercesc/util/BinInputStream.hpp>
#include <xercesc/util/XMLNetAccessor.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
//
// This class is the wrapper for the socket based code which
@@ -110,6 +114,6 @@ inline const XMLCh* SocketNetAccessor::getId() const
}
-
+XERCES_CPP_NAMESPACE_END
#endif // SOCKETNETACCESSOR_HPP
diff --git a/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp b/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
index 208c93931b30901ffac6445e22906a3995789c33..5d27232dd97563bfd1bf2d2642e41e3ea37ce0ee 100644
--- a/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
+++ b/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 15:11:38 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/05/29 14:30:50 peiyongz
* Bug9489: Malformed HTTP GET Requests in UnixHTTPUrlInputStream ,
* patch from Gereon Steffens (gereon.steffens@web.de)
@@ -121,7 +124,7 @@
#include <xercesc/util/Janitor.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
-
+XERCES_CPP_NAMESPACE_BEGIN
UnixHTTPURLInputStream::UnixHTTPURLInputStream(const XMLURL& urlSource)
@@ -337,3 +340,5 @@ unsigned int UnixHTTPURLInputStream::readBytes(XMLByte* const toFill
return len;
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.hpp b/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.hpp
index eb22c2d58d1350b4d5847e97081034815ec58f3d..6af41303da926b1b3f2d7f323d286e4ecd6e8f99 100644
--- a/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.hpp
+++ b/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:23 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:11:38 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:23 peiyongz
+ * sane_include
*
* Revision 1.3 2000/07/21 03:31:42 andyh
* Improved (but still weak) http access by the parser.
@@ -87,7 +90,7 @@
#include <xercesc/util/XMLExceptMsgs.hpp>
#include <xercesc/util/BinInputStream.hpp>
-
+XERCES_CPP_NAMESPACE_BEGIN
//
// This class implements the BinInputStream interface specified by the XML
@@ -140,5 +143,6 @@ inline unsigned int UnixHTTPURLInputStream::curPos() const
return fBytesProcessed;
}
+XERCES_CPP_NAMESPACE_END
#endif // UNIXHTTPURLINPUTSTREAM_HPP
diff --git a/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp b/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp
index 11627816a0e0c607d9a0773660a1a196fe2a98c1..2e917508877695564a8cc7ee9623330a24ff3bb7 100644
--- a/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp
+++ b/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:23 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:11:39 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:23 peiyongz
+ * sane_include
*
* Revision 1.12 2001/12/13 21:16:52 peiyongz
* Fix: Invalid Argument to FreeLibrary (Hint: 0x0000000)
@@ -130,6 +133,7 @@
#include <xercesc/util/Janitor.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
HMODULE gWinsockLib = NULL;
LPFN_GETHOSTBYNAME gWSgethostbyname = NULL;
@@ -541,3 +545,5 @@ unsigned int BinHTTPURLInputStream::readBytes(XMLByte* const toFill
return len;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp b/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp
index 8c8ad852bb8f1c309bb3627217f2ef977eb991e6..ba06c94c8ac68a5e61c1010121db9d4e12620f2c 100644
--- a/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp
+++ b/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:23 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:11:39 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:23 peiyongz
+ * sane_include
*
* Revision 1.5 2001/10/25 16:26:39 tng
* [Bug 4213] BinHTTPURLInputStream initialisation not thread safe. By Mark Weaver.
@@ -105,6 +108,8 @@
struct hostent;
struct sockaddr;
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLUTIL_EXPORT BinHTTPURLInputStream : public BinInputStream
{
public :
@@ -169,6 +174,6 @@ inline unsigned int BinHTTPURLInputStream::curPos() const
return fBytesProcessed;
}
-
+XERCES_CPP_NAMESPACE_END
#endif // BINHTTPURLINPUTSTREAM_HPP
diff --git a/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp b/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
index 9beb07df7085ec91306e74769f0e8f37cd667b7f..72d4a28905a1f18d1b0be32b68bddbd30d981d40 100644
--- a/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
+++ b/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -70,7 +70,7 @@
#include <xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp>
#include <xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.hpp>
-
+XERCES_CPP_NAMESPACE_BEGIN
const XMLCh WinSockNetAccessor::fgMyName[] =
{
@@ -116,3 +116,5 @@ BinInputStream* WinSockNetAccessor::makeNew(const XMLURL& urlSource)
return 0;
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.hpp b/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.hpp
index 3564a91ca15cde962b981d6c8890906e04b3c824..cad724ad95447f6139514d1e80f0c7905caa5d21 100644
--- a/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.hpp
+++ b/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:23 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:11:39 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:23 peiyongz
+ * sane_include
*
* Revision 1.1 2000/03/17 02:37:54 rahulj
* First cut at adding HTTP capability via native sockets.
@@ -80,6 +83,8 @@
#include <xercesc/util/XMLNetAccessor.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This class is the wrapper for the WinSock library which provides
// support for sockets. Its being used here to add the ability to
@@ -108,7 +113,7 @@ inline const XMLCh* WinSockNetAccessor::getId() const
return fgMyName;
}
-
+XERCES_CPP_NAMESPACE_END
#endif // WINSOCKNETACCESSOR_HPP
diff --git a/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.cpp b/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.cpp
index d7d845abe4168d24dd0a5ffeafb342fae5302d5e..66c2c46b5506c6d0781aa65811bc27cf453482ba 100644
--- a/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.cpp
+++ b/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:22:22 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:11:39 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:22 peiyongz
+ * sane_include
*
* Revision 1.6 2001/11/28 19:14:59 knoaman
* Bug 2238: fix by Artur Klauser
@@ -121,6 +124,7 @@
#include <strings.h>
#include <WWWInit.h>
+XERCES_CPP_NAMESPACE_BEGIN
//
// This define specifies the size of the buffer used to read chunks
@@ -196,7 +200,7 @@ BinURLInputStream::BinURLInputStream(const XMLURL& urlSource)
delete [] uriAsCharStar;
HTRequest_delete(request);
// Don't know whether I am supposed to delete counterStrm.
-
+
if (status == NO)
{
ThrowXML1(NetAccessorException, XMLExcepts::NetAcc_InternalError,
@@ -247,7 +251,7 @@ unsigned int BinURLInputStream::readBytes(XMLByte* const toFill
// Wipe out the old stuff from the destination buffer to fill.
memset((void*)toFill, 0x00, sizeof(XMLByte) * maxToRead);
-
+
// You can only read till the end of the remote resource file.
// So, adjust the count of bytes you want to read now.
@@ -336,3 +340,5 @@ unsigned int BinURLInputStream::readBytes(XMLByte* const toFill
return retval;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp b/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp
index 2b68f13a36a3a6251ba3aaf46857b9ae2b4965f4..1fddf8b8ff16a56e2efe62e8e2a9d01393280853 100644
--- a/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp
+++ b/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:22:22 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:11:39 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:22 peiyongz
+ * sane_include
*
* Revision 1.2 2000/02/26 07:56:36 rahulj
* Fixed the license header as pointed out by Bill Schindler <developer@bitranch.com>
@@ -83,6 +86,7 @@
#include <xercesc/util/XMLExceptMsgs.hpp>
#include <xercesc/util/BinInputStream.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
//
// Forward reference the libWWW constructs here, so as to avoid including
@@ -150,5 +154,6 @@ private :
unsigned int fBytesProcessed;
};
+XERCES_CPP_NAMESPACE_END
#endif // BINURLINPUTSTREAM_HPP
diff --git a/src/xercesc/util/NetAccessors/libWWW/LibWWWNetAccessor.cpp b/src/xercesc/util/NetAccessors/libWWW/LibWWWNetAccessor.cpp
index 5261cc93a6a5b1c91e8fb3ab29f23512b6c9ea0d..1f03bf318bb00a3e9016dcb2ebeb39bc06ed6be6 100644
--- a/src/xercesc/util/NetAccessors/libWWW/LibWWWNetAccessor.cpp
+++ b/src/xercesc/util/NetAccessors/libWWW/LibWWWNetAccessor.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "[PRODUCT NAME]" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -66,6 +66,8 @@
#include <WWWInit.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
const XMLCh LibWWWNetAccessor::fgMyName[] =
{
chLatin_l, chLatin_i, chLatin_b, chLatin_W, chLatin_W, chLatin_W,
@@ -96,7 +98,7 @@ LibWWWNetAccessor::~LibWWWNetAccessor()
*
* This call also supersedes the termination function for the
* Library core, HTLibTerminate() so that you don't have to call
- * that after calling this function.
+ * that after calling this function.
*/
HTProfile_delete();
}
@@ -122,3 +124,5 @@ BinInputStream* LibWWWNetAccessor::makeNew(const XMLURL& urlSource)
ThrowXML(MalformedURLException, XMLExcepts::URL_UnsupportedProto);
}
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/NetAccessors/libWWW/LibWWWNetAccessor.hpp b/src/xercesc/util/NetAccessors/libWWW/LibWWWNetAccessor.hpp
index d917e6f3cdf593749682c606d37914ebab9fafb2..c727ed0265e4004edd83bb677c95033cc1cc661e 100644
--- a/src/xercesc/util/NetAccessors/libWWW/LibWWWNetAccessor.hpp
+++ b/src/xercesc/util/NetAccessors/libWWW/LibWWWNetAccessor.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:22:23 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:11:39 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:23 peiyongz
+ * sane_include
*
* Revision 1.2 2001/03/02 14:39:27 tng
* Enabling libWWW NetAccessor support under UNIX. Tested with latest tarball of libWWW
@@ -99,6 +102,7 @@
#include <xercesc/util/BinInputStream.hpp>
#include <xercesc/util/XMLNetAccessor.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
//
// This class is the wrapper for the libWWW library which provides
@@ -128,4 +132,6 @@ inline const XMLCh* LibWWWNetAccessor::getId() const
return fgMyName;
}
+XERCES_CPP_NAMESPACE_END
+
#endif // LIBWWWNETACCESSOR_HPP
diff --git a/src/xercesc/util/Platforms/AIX/AIXPlatformUtils.cpp b/src/xercesc/util/Platforms/AIX/AIXPlatformUtils.cpp
index b579c24473e2d06f8e835c91d6e4f2a1c7be8233..4df63c50ad0df55c66754768d36b8b516c75bfcc 100644
--- a/src/xercesc/util/Platforms/AIX/AIXPlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/AIX/AIXPlatformUtils.cpp
@@ -106,6 +106,8 @@
#include <xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// XMLPlatformUtils: Platform init method
// ---------------------------------------------------------------------------
@@ -283,7 +285,7 @@ XMLPlatformUtils::readFileBuffer( FileHandle theFile
void
XMLPlatformUtils::writeBufferToFile( FileHandle const theFile
, long toWrite
- , const XMLByte* const toFlush)
+ , const XMLByte* const toFlush)
{
if (!theFile ||
(toWrite <= 0 ) ||
@@ -651,3 +653,6 @@ void XMLPlatformUtils::platformInit()
{
}
********************* End of code attic *******************************/
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp b/src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp
index c4b573cd6ae350f751e250439b460b1f08613b86..07a28f32297d74855a5fa19f7ddad36178155b9d 100644
--- a/src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 15:13:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/07/05 21:29:58 peiyongz
* Bug# 10250: patch from James Berry
*
@@ -129,6 +132,7 @@
#include <xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLPlatformUtils: Private Static Methods
@@ -333,7 +337,7 @@ XMLPlatformUtils::readFileBuffer( FileHandle theFile
if (toRead == 0)
return 0;
size_t noOfItemsRead = fread((void*) toFill, 1, toRead, (FILE*)theFile);
-
+
if(ferror((FILE*)theFile))
{
ThrowXML(XMLPlatformUtilsException,
@@ -723,3 +727,5 @@ void XMLPlatformUtils::platformTerm()
atomicOpsMutex.fHandle = 0;
#endif
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Platforms/HPUX/HPPlatformUtils.cpp b/src/xercesc/util/Platforms/HPUX/HPPlatformUtils.cpp
index 60c10fa36f77bffbefe14b1b55d0b93ab80062d9..cf678eebf5fd4c54778d9b793c3b7b8d3f4217f9 100644
--- a/src/xercesc/util/Platforms/HPUX/HPPlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/HPUX/HPPlatformUtils.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2002/11/04 15:13:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.6 2002/07/15 21:52:48 peiyongz
* CouldNotWriteToFile
*
@@ -199,7 +202,7 @@
#endif
-
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
@@ -403,7 +406,7 @@ XMLPlatformUtils::readFileBuffer( FileHandle theFile
void
XMLPlatformUtils::writeBufferToFile( FileHandle const theFile
, long toWrite
- , const XMLByte* const toFlush)
+ , const XMLByte* const toFlush)
{
if (!theFile ||
(toWrite <= 0 ) ||
@@ -788,3 +791,4 @@ void XMLPlatformUtils::platformTerm()
#endif
}
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Platforms/IRIX/IRIXPlatformUtils.cpp b/src/xercesc/util/Platforms/IRIX/IRIXPlatformUtils.cpp
index 4d4538dbdd660d2d6b5b34e4965ab76fa995b9d7..848795bbe5f13e76819e03082745cb81b21835a4 100644
--- a/src/xercesc/util/Platforms/IRIX/IRIXPlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/IRIX/IRIXPlatformUtils.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:13:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/05/21 20:31:47 tng
* Minor update: Remove obsolete code
*
@@ -162,6 +165,7 @@
#include <xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLPlatformUtils: Private Static Methods
@@ -784,4 +788,5 @@ void XMLPlatformUtils::platformTerm()
// We don't have any termination requirements at this time
//}
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Platforms/Linux/LinuxPlatformUtils.cpp b/src/xercesc/util/Platforms/Linux/LinuxPlatformUtils.cpp
index a033c6fadc1a60c934b5661ffd02e158c8756599..bd71f4c876b085eb07e95ba260fc54a573f0eb4a 100644
--- a/src/xercesc/util/Platforms/Linux/LinuxPlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/Linux/LinuxPlatformUtils.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2002/11/04 15:13:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.7 2002/08/19 19:38:17 tng
* [Bug 11771] Linux specific IconvGNU transcoder. Patch from Vasily Tchekalkin.
*
@@ -213,6 +216,8 @@
#endif
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// XMLPlatformUtils: Private Static Methods
// ---------------------------------------------------------------------------
@@ -779,3 +784,5 @@ void XMLPlatformUtils::platformTerm()
#endif
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.cpp b/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.cpp
index 43333f85fa1d3294f2a2c95f10348e4e8ab7a1d5..183ab14a2e8a455fd4db5897d8827fb1e8eb8fb6 100644
--- a/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.cpp
@@ -115,7 +115,7 @@
#include <URLAccess.h>
#endif
-
+XERCES_CPP_NAMESPACE_BEGIN
//----------------------------------------------------------------------------
// Local Constants
@@ -309,7 +309,7 @@ void
XMLMacFile::create(const XMLCh* const filePath)
{
OSErr err = noErr;
-
+
// Split path into directory and filename components
int posSlash = XMLString::lastIndexOf(filePath, '/', XMLString::stringLen(filePath) - 1);
int posName = (posSlash == -1) ? 0 : posSlash+1;
@@ -366,7 +366,7 @@ XMLMacFile::create(const XMLCh* const filePath)
{
// Transcode the unicode name to native encoding
ArrayJanitor<const char> nativeName(XMLString::transcode(namePtr));
-
+
// Make a partial pathname from our current spec (parent directory) to the new file
unsigned char name[31 * 2 + 1 * 2 + 1];
unsigned char* partial = &name[1];
@@ -539,7 +539,7 @@ XMLPlatformUtils::panic(const PanicReasons reason)
XMLCustomPanicProc(reason, reasonStr);
#else
char text[256];
-
+
#if defined(XML_METROWERKS) || defined(_GLIBCPP_USE_C99)
std::snprintf(text, sizeof(text), "Xerces Panic Error: %s", reasonStr);
#else
@@ -1893,3 +1893,5 @@ TranscodeUTF8ToUniChars(char* src, UniChar* dst, std::size_t maxChars)
// Return number of unicode characters in dst
return result;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.hpp b/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.hpp
index 8c3571ceca1f3831c3354f0fe0d6787e21026868..b28ffd5add199fcdb026fa174128533ca2fdc0b6 100644
--- a/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.hpp
+++ b/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -57,7 +57,7 @@
/*
* $Id$
*/
-
+
#pragma once
#include <xercesc/util/XercesDefs.hpp>
@@ -71,6 +71,7 @@
#include <Files.h>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
// Abstract class for files. This could be used to allow multiple file paradigms.
class XMLMacAbstractFile
@@ -78,7 +79,7 @@ class XMLMacAbstractFile
public:
XMLMacAbstractFile() {}
virtual ~XMLMacAbstractFile() {}
-
+
virtual unsigned int currPos() = 0;
virtual void close() = 0;
virtual unsigned int size() = 0;
@@ -96,7 +97,7 @@ class XMLMacFile : public XMLMacAbstractFile
public:
XMLMacFile() : mFileRefNum(0), mFileValid(false) {}
virtual ~XMLMacFile();
-
+
unsigned int currPos();
void close();
unsigned int size();
@@ -105,7 +106,7 @@ class XMLMacFile : public XMLMacAbstractFile
unsigned int read(const unsigned int, XMLByte* const);
void write(const long byteCount, const XMLByte* const buffer);
void reset();
-
+
protected:
void create(const XMLCh* const);
void openWithPermission(const XMLCh* const, int macPermission);
@@ -159,3 +160,6 @@ XMLUTIL_EXPORT XMLCh*
CopyUniCharsToXMLChs(const UniChar* src, XMLCh* dst, std::size_t charCount, std::size_t maxChars);
XMLUTIL_EXPORT UniChar*
CopyXMLChsToUniChars(const XMLCh* src, UniChar* dst, std::size_t charCount, std::size_t maxChars);
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/util/Platforms/OS2/OS2PlatformUtils.cpp b/src/xercesc/util/Platforms/OS2/OS2PlatformUtils.cpp
index ef6226e80e58f9ddfbfdc02376d39a4d2d0bbe2c..a745a63167d25e824e90a63034103af41f776d72 100644
--- a/src/xercesc/util/Platforms/OS2/OS2PlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/OS2/OS2PlatformUtils.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -98,6 +98,7 @@
#endif
#include <OS2.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLPlatformUtils: Platform init and term methods
@@ -540,3 +541,5 @@ XMLTransService* XMLPlatformUtils::makeTransService()
#endif
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/util/Platforms/OS390/OS390PlatformUtils.cpp b/src/xercesc/util/Platforms/OS390/OS390PlatformUtils.cpp
index 9f235cd6d12163a3a410bbaba29fccf132fb4f97..fb79f9cc50e084b9e15496e9e4ae25e355caf743 100644
--- a/src/xercesc/util/Platforms/OS390/OS390PlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/OS390/OS390PlatformUtils.cpp
@@ -106,6 +106,8 @@
#include <xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Static data
// ---------------------------------------------------------------------------
@@ -1007,3 +1009,4 @@ void XMLPlatformUtils::platformTerm()
// We don't have any termination requirements at this time
}
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp b/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp
index e1fea07c92cffff3f3e0ea515e813a3d4dd36364..de971b8bab4a8f25373c4fb15e958a5d95b2ff4b 100644
--- a/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp
@@ -97,7 +97,7 @@
#include <xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp>
#endif
-
+XERCES_CPP_NAMESPACE_BEGIN
char* PackingRepText(const char * const repText1,
const char * const repText2,
@@ -304,7 +304,7 @@ XMLPlatformUtils::readFileBuffer( FileHandle theFile
void
XMLPlatformUtils::writeBufferToFile( FileHandle const theFile
, long toWrite
- , const XMLByte* const toFlush)
+ , const XMLByte* const toFlush)
{
if (!theFile ||
(toWrite <= 0 ) ||
@@ -864,3 +864,5 @@ void XMLPlatformUtils::platformTerm()
cleanupDefaultConverter();
#endif
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.hpp b/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.hpp
index 47083394484e8c27f2d00e3ba44d0e4c3ac87914..cce5ff50093f4964be069117becd57ef8c866016 100644
--- a/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.hpp
+++ b/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.hpp
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:22:25 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:13:01 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:25 peiyongz
+ * sane_include
*
* Revision 1.2 2001/06/25 16:27:05 tng
* AS400 changes by Linda Swan.
@@ -70,6 +73,8 @@
#ifndef _OS400PLATFORMUTILS_H
#define _OS400PLATFORMUTILS_H
+XERCES_CPP_NAMESPACE_BEGIN
+
void send_message (char * text, char * messageid, char type);
void convert_errno(char *,int);
@@ -78,5 +83,7 @@ void convert_errno(char *,int);
#define ICONV_CCSID_PROBLEM "XMLBED5"
#define GENERAL_PANIC_MESSAGE "XMLBEED" /* iconv initialization problem */
+XERCES_CPP_NAMESPACE_END
+
#endif /* _OS400PLATFORMUTILS_H */
diff --git a/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp b/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp
index 9a0331b1e4beaee7c1ca554070150f4c4daf6277..1d47b84f63f3833c7e1c27adce0ae6f358ce7bba 100644
--- a/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:13:01 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/05/21 20:31:47 tng
* Minor update: Remove obsolete code
*
@@ -115,6 +118,7 @@
# include <xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLPlatformUtils: Private Static Methods
@@ -681,3 +685,5 @@ void XMLPlatformUtils::platformTerm()
#endif
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/util/Platforms/PTX/PTXPlatformUtils.cpp b/src/xercesc/util/Platforms/PTX/PTXPlatformUtils.cpp
index 226fbd65a9ce59049cdeba2e75e22f60c59eebc3..be896e455abb1d682e1661a2bbeeb66bd2e8789e 100644
--- a/src/xercesc/util/Platforms/PTX/PTXPlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/PTX/PTXPlatformUtils.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:25 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:13:01 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:25 peiyongz
+ * sane_include
*
* Revision 1.3 2000/04/12 20:34:49 abagchi
* Now just includes the Solaris file directly since they are identical
@@ -76,3 +79,6 @@
#include "../Solaris/SolarisPlatformUtils.cpp"
+XERCES_CPP_NAMESPACE_BEGIN
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp b/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp
index 7ba1d47b00f41dfe180f9e6fd2db935c03469811..e228daafaabd0deac7cd9d372d64e7fe7e2e6872 100644
--- a/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp
@@ -109,7 +109,7 @@
#include <xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp>
#endif
-
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLPlatformUtils: Private Static Methods
@@ -302,7 +302,7 @@ XMLPlatformUtils::readFileBuffer(FileHandle theFile
void
XMLPlatformUtils::writeBufferToFile( FileHandle const theFile
, long toWrite
- , const XMLByte* const toFlush)
+ , const XMLByte* const toFlush)
{
if (!theFile ||
(toWrite <= 0 ) ||
@@ -781,3 +781,4 @@ void XMLPlatformUtils::platformTerm()
#endif
}
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Platforms/Tandem/TandemPlatformUtils.cpp b/src/xercesc/util/Platforms/Tandem/TandemPlatformUtils.cpp
index 5cc7374552179dde7585a5aa50cbde328b729b84..a2d8681b3231dda5f103e9b721850e95c59e797f 100644
--- a/src/xercesc/util/Platforms/Tandem/TandemPlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/Tandem/TandemPlatformUtils.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:13:01 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/05/21 20:31:48 tng
* Minor update: Remove obsolete code
*
@@ -98,6 +101,7 @@
#include <sys/timeb.h>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLPlatformUtils: Platform init method
@@ -325,3 +329,5 @@ void XMLPlatformUtils::platformTerm()
// We don't have any termination requirements at this time
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp b/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp
index 138fcbe08ef06f71a9243d7d2ff0575b24151e2b..6dc8fca3ba94d46ab69419661d2e9b42bec77aae 100644
--- a/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp
@@ -112,6 +112,8 @@
#include <xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// XMLPlatformUtils: Private Static Methods
// ---------------------------------------------------------------------------
@@ -303,7 +305,7 @@ unsigned int XMLPlatformUtils::readFileBuffer(FileHandle theFile,
void
XMLPlatformUtils::writeBufferToFile( FileHandle const theFile
, long toWrite
- , const XMLByte* const toFlush)
+ , const XMLByte* const toFlush)
{
if (!theFile ||
(toWrite <= 0 ) ||
@@ -737,3 +739,5 @@ void XMLPlatformUtils::platformTerm()
gAtomicOpMutex = 0;
#endif
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp b/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
index 160ed4b916bafb244b3954cf50dd95ad42cfbb7c..cb2527931ffcacfe8bd5444933014b40b0b0ec65 100644
--- a/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:13:01 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/05/21 20:31:48 tng
* Minor update: Remove obsolete code
*
@@ -155,6 +158,7 @@
#include <xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XMLPlatformUtils: Private Static Methods
@@ -719,3 +723,4 @@ void XMLPlatformUtils::platformTerm()
#endif
}
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Platforms/Win32/Win32PlatformUtils.cpp b/src/xercesc/util/Platforms/Win32/Win32PlatformUtils.cpp
index 28f21b080724fa4975a3a9d8652026d1ffdd9472..890e12ee6c7c1b703b9bb4e72e4280b780caf47e 100644
--- a/src/xercesc/util/Platforms/Win32/Win32PlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/Win32/Win32PlatformUtils.cpp
@@ -120,7 +120,7 @@
#include <xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.hpp>
#endif
-
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local data
@@ -935,3 +935,5 @@ void XMLPlatformUtils::platformTerm()
{
// We don't have any temrination requirements for win32 at this time
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp b/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp
index 654801998958bb663332984a483ed43e1216b0fd..2cce9bd435297e437e8368acaefccb2be8da0007 100644
--- a/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp
+++ b/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2002/11/04 15:14:32 tng
+ * C++ Namespace Support.
+ *
* Revision 1.1 2002/08/19 18:35:56 tng
* [Bug 6467] Installing Xerces C++ on cygwin environment.
*
@@ -75,7 +78,7 @@
#include <windows.h>
#include <stdlib.h>
-
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local, const data
@@ -1096,7 +1099,7 @@ bool CygwinLCPTranscoder::transcode( const XMLCh* const toTranscode
}
-
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp b/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp
index 89fe575201d4ef13f1fa016b72f0eafdc2cbc726..b1f7650dae0d54c4270ade92d611d007f2aa0f4a 100644
--- a/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp
+++ b/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp
@@ -62,6 +62,8 @@
#include <xercesc/util/RefHashTableOf.hpp>
#include <windows.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
class CPMapEntry;
@@ -283,4 +285,6 @@ private :
void operator=(const CygwinLCPTranscoder&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp b/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp
index d9c6f651aab98948c9dfd035950883cfadde9da6..a52483ddeb3fbaac4645e1ab949f7935493961a4 100644
--- a/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp
+++ b/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp
@@ -86,7 +86,7 @@ extern "C" const uint8_t U_IMPORT icudata_dat[];
#endif
#endif
-
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local, const data
@@ -1150,3 +1150,5 @@ bool ICULCPTranscoder::transcode( const XMLCh* const toTranscode
toFill[targetCap] = 0;
return true;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp b/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp
index 89c086e3ef2c6af8f1cf46388c287bc264e2c70f..f2031aafe2b1351f51cc72808ca5bd0be227973c 100644
--- a/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp
+++ b/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:14:33 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/04/09 15:44:00 knoaman
* Add lower case string support.
*
@@ -108,6 +111,8 @@
#include <xercesc/util/Mutexes.hpp>
#include <xercesc/util/TransService.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
struct UConverter;
class XMLUTIL_EXPORT ICUTransService : public XMLTransService
@@ -307,4 +312,6 @@ private :
XMLMutex fMutex;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp b/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
index 6496add47839145404db12e58f3f234b0c7cccfa..37e0daf320431a2e836772f7efdba400bbb525f6 100644
--- a/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
+++ b/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
@@ -75,6 +75,7 @@
#include <stdlib.h>
#include <stdio.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local, const data
@@ -555,3 +556,5 @@ IconvTranscoder::transcodeXML( const XMLByte* const srcData
bytesEaten = countIn;
return countOut;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Transcoders/Iconv/IconvTransService.hpp b/src/xercesc/util/Transcoders/Iconv/IconvTransService.hpp
index 9121f8de2f45d89a1120a1928f92cdcb2689e85f..e4aa3824f939396104242c479e9e2cca87ab573a 100644
--- a/src/xercesc/util/Transcoders/Iconv/IconvTransService.hpp
+++ b/src/xercesc/util/Transcoders/Iconv/IconvTransService.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:14:33 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/04/09 15:44:00 knoaman
* Add lower case string support.
*
@@ -100,6 +103,8 @@
#include <xercesc/util/TransService.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLUTIL_EXPORT IconvTransService : public XMLTransService
{
public :
@@ -245,4 +250,6 @@ private :
void operator=(const IconvLCPTranscoder&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.cpp b/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.cpp
index d0491c1521ffac8def8824824fc181786b73d108..3fabfaaabe5aa8599842524752f416ba973e0e30 100644
--- a/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.cpp
+++ b/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.cpp
@@ -75,6 +75,9 @@
#include <unistd.h>
#endif
#include <ctype.h>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// Cannot use the OS/390 c/c++ towupper and towlower functions in the
// Unicode environment. We will use mytowupper and mytowlower here.
@@ -662,3 +665,5 @@ Iconv390Transcoder::transcodeXML( const XMLByte* const srcData
return maxChars-outByteLeft/2;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.hpp b/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.hpp
index f0b7839a4456641c148a16dc319ef1fb7051efc9..a383a147fd627a15ae5232ad9fef9dadc0aab5f8 100644
--- a/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.hpp
+++ b/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:14:33 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/04/09 15:44:00 knoaman
* Add lower case string support.
*
@@ -83,6 +86,8 @@
#include <xercesc/util/Mutexes.hpp>
#include <iconv.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
/* Max encoding name in characters. */
#define UCNV_MAX_CONVERTER_NAME_LENGTH 60
typedef struct iconvconverter {
@@ -239,4 +244,6 @@ private :
iconvconverter_t *converter;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp b/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp
index 429f0252e0c3876f5e9b19572204f6394dece25b..10f54d7cd6722170906c35327b5e0ddb1124f41d 100644
--- a/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp
+++ b/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp
@@ -74,6 +74,8 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/Janitor.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Local functions
// ---------------------------------------------------------------------------
@@ -1036,3 +1038,5 @@ bool Iconv400LCPTranscoder::transcode( const XMLCh* const toTranscode
return true;
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.hpp b/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.hpp
index dfd3964696e58a2eaaadde635d8d5edacebe4660..99531874e1d9fca88cc49a54e87837c654d17aeb 100644
--- a/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.hpp
+++ b/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.hpp
@@ -3,35 +3,35 @@
*
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -66,6 +66,8 @@
#include <xercesc/util/TransService.hpp>
#include <qlg.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
struct UConverter;
class XMLUTIL_EXPORT Iconv400TransService : public XMLTransService
@@ -295,4 +297,6 @@ private :
XMLMutex fMutex;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/util/Transcoders/Iconv400/iconv_cnv.cpp b/src/xercesc/util/Transcoders/Iconv400/iconv_cnv.cpp
index cd42f09bb051b8c1fe6c92d493afdaff9663e526..cdec1a09a93d71411b348614e459bbaaf621b917 100644
--- a/src/xercesc/util/Transcoders/Iconv400/iconv_cnv.cpp
+++ b/src/xercesc/util/Transcoders/Iconv400/iconv_cnv.cpp
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:22:36 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:14:33 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:36 peiyongz
+ * sane_include
*
* Revision 1.1 2001/06/25 16:19:14 tng
* Rename iconv_cnv.c to iconv_cnv.cpp. AS400 changes by Linda Swan.
@@ -86,6 +89,8 @@
#include <errno.h>
#define CHUNK_SIZE 5*1024
+XERCES_CPP_NAMESPACE_BEGIN
+
void Convert_toUnicode(UConverter *,
UChar **,
const UChar *,
@@ -773,3 +778,5 @@ UChar getNextUChar(UConverter* converter,
return myUChar;
}
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Transcoders/Iconv400/iconv_cnv.hpp b/src/xercesc/util/Transcoders/Iconv400/iconv_cnv.hpp
index 582686e71ffb814a2b50b175dd19aaeb342999ca..8df728f0fa3cf62d116a8bbdb80f4cb45330f964 100644
--- a/src/xercesc/util/Transcoders/Iconv400/iconv_cnv.hpp
+++ b/src/xercesc/util/Transcoders/Iconv400/iconv_cnv.hpp
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:22:36 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:14:33 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:36 peiyongz
+ * sane_include
*
* Revision 1.1 2001/06/25 16:19:34 tng
* Rename iconv_cnv.h to iconv_cnv.hpp. AS400 changes by Linda Swan.
@@ -72,6 +75,8 @@
#include "utypes.h"
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* Creates a UConverter object with the names specified as a C string.
* The actual name will be resolved with the alias file.
@@ -343,7 +348,7 @@ U_CAPI
int32_t sourceLength,
UErrorCode * err);
-
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/util/Transcoders/Iconv400/iconv_util.cpp b/src/xercesc/util/Transcoders/Iconv400/iconv_util.cpp
index 795f2228f83ff2595cc057c519410827c489c966..dc593a45cf086230c797ff91c96cb6994be00015 100644
--- a/src/xercesc/util/Transcoders/Iconv400/iconv_util.cpp
+++ b/src/xercesc/util/Transcoders/Iconv400/iconv_util.cpp
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:22:36 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:14:33 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:36 peiyongz
+ * sane_include
*
* Revision 1.2 2001/10/24 14:06:59 peiyongz
* [Bug#880] patch to PlatformUtils:init()/term() and related. from Mark Weaver
@@ -77,6 +80,9 @@
#include <iconv_util.hpp>
#include <iconv_cnv.hpp>
#include <ctype.h>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
#define COPYRIGHT_STRING_LENGTH 200
#define MAX_STRLEN 0x00FFFFF
#define CHARCCSIDSIZE 5
@@ -290,3 +296,4 @@ UConverter* createNewConverter(const char *name, UErrorCode *err)
}
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Transcoders/Iconv400/iconv_util.hpp b/src/xercesc/util/Transcoders/Iconv400/iconv_util.hpp
index f614935a55e507b4911b23ecd1c64138cac03151..6e0ce6f13aa78f9c6578eee0010b323db9e7666d 100644
--- a/src/xercesc/util/Transcoders/Iconv400/iconv_util.hpp
+++ b/src/xercesc/util/Transcoders/Iconv400/iconv_util.hpp
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:22:36 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:14:33 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:36 peiyongz
+ * sane_include
*
* Revision 1.1 2001/06/25 16:20:08 tng
* Rename iconv_util.h to iconv_util.hpp. AS400 changes by Linda Swan.
@@ -67,6 +70,7 @@
*
*/
+
const char* iconv_getDefaultCodepage(void);
@@ -158,3 +162,5 @@ UConverter* createNewConverter(const char *name, UErrorCode *err);
*/
static void initializeDataConverter (UConverter * myUConverter);
UConverter *createConverter (const char *converterName, UErrorCode * err);
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Transcoders/Iconv400/utypes.h b/src/xercesc/util/Transcoders/Iconv400/utypes.h
index 6328a17147826323f07b134853d5bef1283dcb72..42a732fffedb1819af2f3d4762bbc3ad6a24f7d3 100644
--- a/src/xercesc/util/Transcoders/Iconv400/utypes.h
+++ b/src/xercesc/util/Transcoders/Iconv400/utypes.h
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/**
* $Log$
- * Revision 1.1 2002/02/01 22:22:36 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:14:33 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:36 peiyongz
+ * sane_include
*
* Revision 1.1 2000/02/10 18:08:28 abagchi
* Initial checkin
@@ -76,7 +79,9 @@
#include "pos400.h"
-/* XP_CPLUSPLUS is a cross-platform symbol which should be defined when
+XERCES_CPP_NAMESPACE_BEGIN
+
+/* XP_CPLUSPLUS is a cross-platform symbol which should be defined when
using C++. It should not be defined when compiling under C. */
#ifdef __cplusplus
# ifndef XP_CPLUSPLUS
@@ -182,10 +187,10 @@ enum UErrorCode {
U_ERROR_LIMIT
};
#ifdef __OS400__
-typedef int UErrorCode;
+typedef int UErrorCode;
#define U_SUCCESS(x) ((x)<=U_ZERO_ERROR)
#define U_FAILURE(x) ((x)>U_ZERO_ERROR)
-#else
+#else
#ifndef XP_CPLUSPLUS
typedef enum UErrorCode UErrorCode;
#endif
@@ -269,5 +274,6 @@ errorName(UErrorCode code)
"[BOGUS UErrorCode]"
#endif
+XERCES_CPP_NAMESPACE_END
#endif /* _UTYPES */
diff --git a/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp b/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp
index 32847cfb7c2a259efe95174c08d004b9e708395e..53db38bbda95856d8f26b8886a4a7016d1e33e85 100644
--- a/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp
+++ b/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2002/11/04 15:14:34 tng
+ * C++ Namespace Support.
+ *
* Revision 1.5 2002/07/04 18:20:18 tng
* [Bug 10253] Bugfix for the IconvFBSD transcoder. Patch from Max Gotlib.
*
@@ -97,6 +100,8 @@
# include <errno.h>
# include <machine/endian.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Description of encoding schemas, supported by iconv()
// ---------------------------------------------------------------------------
@@ -1550,4 +1555,6 @@ bool IconvFBSDTranscoder::canTranscodeTo
return (rc != (size_t)-1) && (len == 0);
}
+XERCES_CPP_NAMESPACE_END
+
#endif /* XML_USE_LIBICONV */
diff --git a/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp b/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp
index bec82b503efd10917834fe61ad11a06f4e7cc59d..7751524e95b671b10594c58786fee8a4009c02e6 100644
--- a/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp
+++ b/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 2001, International
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:14:34 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/04/11 15:38:05 knoaman
* String lower case support for FreeBSD by Max Gotlib
*
@@ -82,6 +85,8 @@
#include <xercesc/util/TransService.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
#ifdef XML_USE_LIBICONV
# include <iconv.h>
@@ -108,7 +113,7 @@ public:
// Convert "native unicode" character into XMLCh
void mbcToXMLCh (const char *mbc, XMLCh *toRet) const;
- // Convert XMLCh into "native unicode" character
+ // Convert XMLCh into "native unicode" character
void xmlChToMbc (XMLCh xch, char *mbc) const;
// Return uppercase equivalent for XMLCh
@@ -118,7 +123,7 @@ public:
XMLCh toLower (const XMLCh ch) const;
// Check if passed characters belongs to the :space: class
- virtual bool isSpace(const XMLCh toCheck) const;
+ virtual bool isSpace(const XMLCh toCheck) const;
// Fill array of XMLCh characters with data, supplyed in the array
// of "native unicode" characters.
@@ -174,7 +179,7 @@ protected:
inline void setCDFrom (iconv_t cd) { fCDFrom = cd; }
inline void setUChSize (size_t sz) { fUChSize = sz; }
inline void setUBO (unsigned int u) { fUBO = u; }
-
+
private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
@@ -259,7 +264,7 @@ protected :
, const unsigned int blockSize
);
-
+
private :
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
@@ -370,7 +375,7 @@ protected:
IconvFBSDLCPTranscoder(); // Unimplemented
public:
-
+
#else /* !XML_USE_LIBICONV */
IconvFBSDLCPTranscoder();
@@ -414,4 +419,6 @@ private :
void operator=(const IconvFBSDLCPTranscoder&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif /* ICONVFBSDTRANSSERVICE */
diff --git a/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp b/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp
index 1641407cff84272e55e38e9a7ad6b70950ec1446..044c5aa7ef3a182c46a26a5ae120466a35377d1e 100644
--- a/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp
+++ b/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:14:34 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/27 13:33:43 tng
* [Bug 12547] Xerces C++ 2.1 fails to build on Linux 64 bits arch with -tlinux. Patch from Guillaume Morin.
*
@@ -74,6 +77,8 @@
#include <errno.h>
#include <endian.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Description of encoding schemas, supported by iconv()
// ---------------------------------------------------------------------------
@@ -1181,3 +1186,5 @@ bool IconvGNUTranscoder::canTranscodeTo
return (rc != (size_t)-1) && (len == 0);
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp b/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
index 22da32eae45e830f173173210697b2fb15f5c09a..c46b68dfd57893fd63d8021e9f9a0f01d7e05c37 100644
--- a/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
+++ b/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2002/11/04 15:14:34 tng
+ * C++ Namespace Support.
+ *
* Revision 1.1 2002/08/19 19:38:18 tng
* [Bug 11771] Linux specific IconvGNU transcoder. Patch from Vasily Tchekalkin.
*
@@ -69,6 +72,8 @@
#include <iconv.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Libiconv wrapper (low-level conversion utilities collection)
// ---------------------------------------------------------------------------
@@ -377,5 +382,7 @@ private :
void operator=(const IconvGNULCPTranscoder&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif /* ICONVGNUTRANSSERVICE */
diff --git a/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp b/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
index 009957a16786784c3fab5b516268a0770a0d6465..78dfe5e3840ccd605a3961dffcf099591a2d4e28 100644
--- a/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
+++ b/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -97,6 +97,7 @@
#include <CFString.h>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Typedefs
@@ -166,7 +167,7 @@ int MacOSUnicodeConverter::compareIString( const XMLCh* const comp1
// to allow for the case where the strings being compared
// are larger than the static buffer.
- UCCollateOptions collateOptions =
+ UCCollateOptions collateOptions =
kUCCollateComposeInsensitiveMask
| kUCCollateWidthInsensitiveMask
| kUCCollateCaseInsensitiveMask
@@ -282,7 +283,7 @@ int MacOSUnicodeConverter::compareNIString( const XMLCh* const comp1
// to allow for the case where the strings being compared
// are larger than the static buffer.
- UCCollateOptions collateOptions =
+ UCCollateOptions collateOptions =
kUCCollateComposeInsensitiveMask
| kUCCollateWidthInsensitiveMask
| kUCCollateCaseInsensitiveMask
@@ -470,7 +471,7 @@ void MacOSUnicodeConverter::upperCase(XMLCh* const toUpperCase) const
kCFAllocatorNull);
CFStringUppercase(cfString, NULL);
CFRelease(cfString);
-
+
#elif defined(XML_METROWERKS) || (__GNUC__ >= 3 && _GLIBCPP_USE_WCHAR_T)
// Use this if there's a reasonable c library available.
@@ -498,7 +499,7 @@ void MacOSUnicodeConverter::lowerCase(XMLCh* const toLowerCase) const
kCFAllocatorNull);
CFStringLowercase(cfString, NULL);
CFRelease(cfString);
-
+
#elif defined(XML_METROWERKS) || (__GNUC__ >= 3 && _GLIBCPP_USE_WCHAR_T)
// Use this if there's a reasonable c library available.
@@ -627,7 +628,7 @@ MacOSTranscoder::transcodeFrom( const XMLByte* const srcData
{
ByteCount bytesConsumed = 0;
ByteCount bytesProduced = 0;
-
+
OSStatus status = ConvertFromTextToUnicode(
mTextToUnicodeInfo,
srcCount,
@@ -681,7 +682,7 @@ MacOSTranscoder::transcodeTo(const XMLCh* const srcData
const XMLCh* src = srcData;
std::size_t srcCnt = srcCount;
-
+
OptionBits controlFlags =
0
// | kUnicodeUseFallbacksMask
@@ -1222,7 +1223,7 @@ MacOSLCPTranscoder::transcode( const char* const toTranscode
// XMLCh in place within the output buffer.
if (UNICODE_SIZE_MISMATCH)
CopyUniCharsToXMLChs(reinterpret_cast<UniChar* const>(toFill), toFill, charsProduced, maxChars);
-
+
// Zero terminate the output string
toFill[charsProduced] = L'\0';
@@ -1309,3 +1310,5 @@ MacOSLCPTranscoder::transcode( const XMLCh* const toTranscode
return (status == noErr);
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp b/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
index af51a470b9739bc4380e53e9786d19eb19a0764d..d62ef9683514557f02eeff62e21eb115727b3242 100644
--- a/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
+++ b/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -72,6 +72,8 @@
#include <UnicodeConverter.h>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// The transcoding service has to provide a couple of required string
// and character operations, but its most important service is the creation
@@ -128,7 +130,7 @@ protected :
, XMLTransService::Codes& resValue
, const unsigned int blockSize
);
-
+
// Sniff for available functionality
static bool IsMacOSUnicodeConverterSupported(void);
@@ -143,7 +145,7 @@ private :
// -----------------------------------------------------------------------
MacOSUnicodeConverter(const MacOSUnicodeConverter&);
void operator=(const MacOSUnicodeConverter&);
-
+
// -----------------------------------------------------------------------
// Private methods
// -----------------------------------------------------------------------
@@ -210,7 +212,7 @@ private :
// -----------------------------------------------------------------------
MacOSTranscoder(const MacOSTranscoder&);
void operator=(const MacOSTranscoder&);
-
+
// -----------------------------------------------------------------------
// Private members
// -----------------------------------------------------------------------
@@ -275,7 +277,7 @@ private :
// -----------------------------------------------------------------------
MacOSLCPTranscoder(const MacOSLCPTranscoder&);
void operator=(const MacOSLCPTranscoder&);
-
+
// -----------------------------------------------------------------------
// Private data members
// -----------------------------------------------------------------------
@@ -283,4 +285,6 @@ private :
UnicodeToTextInfo mUnicodeToTextInfo;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp b/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp
index f35ce613422a7fb7e3430408b26780e9ff24479a..7a873c93eb8c7c2bc4d99e2d2dc2936001a42e40 100644
--- a/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp
+++ b/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp
@@ -72,6 +72,7 @@
#include "Win32TransService.hpp"
#include <windows.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
@@ -949,7 +950,7 @@ bool Win32LCPTranscoder::transcode( const XMLCh* const toTranscode
}
-
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp b/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp
index 788098f467aed57bab8dba1b1b327da2dee30ef4..6ffbce614ae21eb3076d44aa52d9f85e0f7baaf7 100644
--- a/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp
+++ b/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:14:34 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/04/09 15:44:00 knoaman
* Add lower case string support.
*
@@ -113,6 +116,8 @@
#include <xercesc/util/RefHashTableOf.hpp>
#include <windows.h>
+XERCES_CPP_NAMESPACE_BEGIN
+
class CPMapEntry;
@@ -327,4 +332,6 @@ private :
void operator=(const Win32LCPTranscoder&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/util/Transcoders/Win32/Win32TransService2.cpp b/src/xercesc/util/Transcoders/Win32/Win32TransService2.cpp
index 04ea5c1de5d3d4abaebe59b79d66c4548067e85a..3d54071b832b1fdc8f282c3f7beec5a3731e99d0 100644
--- a/src/xercesc/util/Transcoders/Win32/Win32TransService2.cpp
+++ b/src/xercesc/util/Transcoders/Win32/Win32TransService2.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:37 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:14:34 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:37 peiyongz
+ * sane_include
*
* Revision 1.3 2000/05/09 00:22:45 andyh
* Memory Cleanup. XMLPlatformUtils::Terminate() deletes all lazily
@@ -83,4 +86,5 @@
#include "Win32TransService.hpp"
#include <windows.h>
-
+XERCES_CPP_NAMESPACE_BEGIN
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/XercesDefs.hpp b/src/xercesc/util/XercesDefs.hpp
index 6131cf35b70091b106ab2d46094feee592692a1b..3b57bd9cde8789ab9e9a32ae0b8a2ffa234d0e7c 100644
--- a/src/xercesc/util/XercesDefs.hpp
+++ b/src/xercesc/util/XercesDefs.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2002/11/04 14:40:12 tng
+ * C++ Namespace Support.
+ *
* Revision 1.7 2002/07/12 16:48:49 jberry
* Remove reliance on XML_MACOSX. XML_MACOS is used solely. Where qualification
* by compiler is required, look for the compiler explicitly such as with
@@ -400,6 +403,24 @@ typedef XMLUInt32 UCS4Ch;
#endif
+// ---------------------------------------------------------------------------
+// Define namespace symbols if the compiler supports it.
+// ---------------------------------------------------------------------------
+#if defined(XERCES_HAS_CPP_NAMESPACE)
+ #define XERCES_CPP_NAMESPACE_BEGIN namespace XERCES_CPP_NAMESPACE {
+ #define XERCES_CPP_NAMESPACE_END }
+ #define XERCES_CPP_NAMESPACE_USE using namespace XERCES_CPP_NAMESPACE;
+ #define XERCES_CPP_NAMESPACE_QUALIFIER XERCES_CPP_NAMESPACE::
+
+ namespace XERCES_CPP_NAMESPACE { }
+ namespace xercesc = XERCES_CPP_NAMESPACE;
+ XERCES_CPP_NAMESPACE_USE
+#else
+ #define XERCES_CPP_NAMESPACE_BEGIN
+ #define XERCES_CPP_NAMESPACE_END
+ #define XERCES_CPP_NAMESPACE_USE
+ #define XERCES_CPP_NAMESPACE_QUALIFIER
+#endif
// ---------------------------------------------------------------------------
// Set up the import/export keyword for our core projects. The
diff --git a/src/xercesc/util/XercesVersion.hpp b/src/xercesc/util/XercesVersion.hpp
index 5205ea04f4ec48306142f3f2024d50c3270b5090..5e668f0a21481a702c133fb8f7e17caae577f5ed 100644
--- a/src/xercesc/util/XercesVersion.hpp
+++ b/src/xercesc/util/XercesVersion.hpp
@@ -117,7 +117,7 @@
* constant whose value, for the above example, will be "19.3.74".
*
* XERCES_VERSIONSTR is a preprocessor macro that expands to a string
- * constant whose value, for the above example, will be "19374". This
+ * constant whose value, for the above example, will be "19_3". This
* particular macro is very dangerous if it were to be used for comparing
* version numbers since ordering will not be guaranteed.
*
@@ -193,12 +193,14 @@
#define CAT3_SEP_PERIOD(a, b, c) #a "." #b "." #c
#define CAT3_SEP_NIL(a, b, c) #a #b #c
#define CAT3_RAW_NUMERIC(a, b, c) a ## b ## c
+#define CAT3_RAW_NUMERIC_SEP_UNDERSCORE(a, b, c) a ## _ ## b ## _ ## c
// three argument macro invokers
#define INVK_CAT3_SEP_UNDERSCORE(a,b,c) CAT3_SEP_UNDERSCORE(a,b,c)
#define INVK_CAT3_SEP_PERIOD(a,b,c) CAT3_SEP_PERIOD(a,b,c)
#define INVK_CAT3_SEP_NIL(a,b,c) CAT3_SEP_NIL(a,b,c)
#define INVK_CAT3_RAW_NUMERIC(a,b,c) CAT3_RAW_NUMERIC(a,b,c)
+#define INVK_CAT3_RAW_NUMERIC_SEP_UNDERSCORE(a,b,c) CAT3_RAW_NUMERIC_SEP_UNDERSCORE(a,b,c)
// ---------------------------------------------------------------------------
// C A L C U L A T E V E R S I O N - E X P A N D E D F O R M
@@ -217,6 +219,10 @@
#define XERCES_FULLVERSIONNUM INVK_CAT3_SEP_NIL(XERCES_VERSION_MAJOR,XERCES_VERSION_MINOR,XERCES_VERSION_REVISION)
#define XERCES_VERSIONSTR INVK_CAT2_SEP_UNDERSCORE(XERCES_VERSION_MAJOR,XERCES_VERSION_MINOR)
+// Xerces C++ Namespace string, concatenated with full version string
+#define XERCES_PRODUCT xercesc
+#define XERCES_CPP_NAMESPACE INVK_CAT3_RAW_NUMERIC_SEP_UNDERSCORE(XERCES_PRODUCT,XERCES_VERSION_MAJOR,XERCES_VERSION_MINOR)
+
// original from Xerces header
#define Xerces_DLLVersionStr XERCES_FULLVERSIONSTR
diff --git a/src/xercesc/util/regx/ASCIIRangeFactory.cpp b/src/xercesc/util/regx/ASCIIRangeFactory.cpp
index 6305213b15f24fdb013af963da61e9fef99e3eee..3fe8ed4b2699310e3753ad9b74faaceafa4f8cac 100644
--- a/src/xercesc/util/regx/ASCIIRangeFactory.cpp
+++ b/src/xercesc/util/regx/ASCIIRangeFactory.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/05 13:20:06 tng
* [Bug 5716] Can't parse with Validation more than one file.
*
@@ -94,6 +97,7 @@
#include <xercesc/util/regx/RangeToken.hpp>
#include <xercesc/util/regx/RangeTokenMap.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// ASCIIRangeFactory: Constructors and Destructor
@@ -179,6 +183,8 @@ void ASCIIRangeFactory::initializeKeywordMap() {
fKeywordsInitialized = true;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file ASCIIRangeFactory.cpp
*/
diff --git a/src/xercesc/util/regx/ASCIIRangeFactory.hpp b/src/xercesc/util/regx/ASCIIRangeFactory.hpp
index dd0ffa21ff464d9220ac6efee3e4c89fa238816b..6cff3981209e7f065b8dad9cb31e69f43efa820f 100644
--- a/src/xercesc/util/regx/ASCIIRangeFactory.hpp
+++ b/src/xercesc/util/regx/ASCIIRangeFactory.hpp
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/RangeFactory.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT ASCIIRangeFactory: public RangeFactory {
@@ -98,6 +99,8 @@ private:
bool fKeywordsInitialized;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/BMPattern.cpp b/src/xercesc/util/regx/BMPattern.cpp
index 7612237ae9af14bd329be6d38f19ac0feebcce07..bad554bef55bdbc9391255088e21555a475dba4e 100644
--- a/src/xercesc/util/regx/BMPattern.cpp
+++ b/src/xercesc/util/regx/BMPattern.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:28 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:28 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:26:40 tng
* Copyright update.
@@ -74,6 +77,8 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/Janitor.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// BMPattern: Constructors
// ---------------------------------------------------------------------------
@@ -217,6 +222,8 @@ void BMPattern::initialize() {
}
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file BMPattern.cpp
*/
diff --git a/src/xercesc/util/regx/BMPattern.hpp b/src/xercesc/util/regx/BMPattern.hpp
index 60714985438edc8e49e1dd840f771e48ea20da74..4bdcf6cf17a6ac487bed0cdeb8c72e9c08e4ed2d 100644
--- a/src/xercesc/util/regx/BMPattern.hpp
+++ b/src/xercesc/util/regx/BMPattern.hpp
@@ -65,6 +65,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLUTIL_EXPORT BMPattern {
public:
// -----------------------------------------------------------------------
@@ -175,6 +177,8 @@ inline void BMPattern::cleanUp() {
delete [] fShiftTable;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/*
diff --git a/src/xercesc/util/regx/BlockRangeFactory.cpp b/src/xercesc/util/regx/BlockRangeFactory.cpp
index b3cb2f7302fd843ab4d0ee0358f375b0bc2ca6e4..5b8f75d6a4077da21f59a626a83f25b7d771a9f7 100644
--- a/src/xercesc/util/regx/BlockRangeFactory.cpp
+++ b/src/xercesc/util/regx/BlockRangeFactory.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/24 19:59:36 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -107,6 +110,7 @@
#include <xercesc/util/regx/RangeTokenMap.hpp>
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local static data
@@ -446,6 +450,8 @@ void BlockRangeFactory::initializeKeywordMap() {
fKeywordsInitialized = true;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file BlockRangeFactory.cpp
*/
diff --git a/src/xercesc/util/regx/BlockRangeFactory.hpp b/src/xercesc/util/regx/BlockRangeFactory.hpp
index f5c0de15a4d567c1936144a977e41537129db1ed..de4a276f4f6f67f8259d57e52dfe2327ab98c88c 100644
--- a/src/xercesc/util/regx/BlockRangeFactory.hpp
+++ b/src/xercesc/util/regx/BlockRangeFactory.hpp
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/RangeFactory.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT BlockRangeFactory: public RangeFactory {
@@ -98,6 +99,8 @@ private:
bool fKeywordsInitialized;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/CharToken.cpp b/src/xercesc/util/regx/CharToken.cpp
index 9df279d400dc33452b7e09afc69bfb147f9c4790..e0b590c9e922216ee2cf28725494e9b5b2f39e20 100644
--- a/src/xercesc/util/regx/CharToken.cpp
+++ b/src/xercesc/util/regx/CharToken.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:28 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:28 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:26:40 tng
* Copyright update.
@@ -72,6 +75,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/CharToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Token: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -87,6 +92,8 @@ CharToken::~CharToken() {
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file CharToken.cpp
*/
diff --git a/src/xercesc/util/regx/CharToken.hpp b/src/xercesc/util/regx/CharToken.hpp
index a3ced311925a018095f537b278e7a085c1c1151e..9d9069e147474200d8672c4eb0b2bd77685f8b6f 100644
--- a/src/xercesc/util/regx/CharToken.hpp
+++ b/src/xercesc/util/regx/CharToken.hpp
@@ -66,6 +66,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/Token.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLUTIL_EXPORT CharToken : public Token {
public:
// -----------------------------------------------------------------------
@@ -115,6 +117,8 @@ inline bool CharToken::match(const XMLInt32 ch){
return ch == fCharData;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/ClosureToken.cpp b/src/xercesc/util/regx/ClosureToken.cpp
index aa1463b3f23447c9278169ab73a2dc58a4aacd7e..be076d907120e7e019ba71ad909101f7a874108b 100644
--- a/src/xercesc/util/regx/ClosureToken.cpp
+++ b/src/xercesc/util/regx/ClosureToken.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:29 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:29 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:26:41 tng
* Copyright update.
@@ -72,6 +75,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/ClosureToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ClosureToken: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -89,6 +94,8 @@ ClosureToken::~ClosureToken() {
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file ClosureToken.cpp
*/
diff --git a/src/xercesc/util/regx/ClosureToken.hpp b/src/xercesc/util/regx/ClosureToken.hpp
index a7569586ecdf101657a6f3902cce17fc9b032144..05f381d610bab6c01746b428c2a443cea288dcb9 100644
--- a/src/xercesc/util/regx/ClosureToken.hpp
+++ b/src/xercesc/util/regx/ClosureToken.hpp
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/Token.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT ClosureToken : public Token {
public:
@@ -142,6 +143,8 @@ inline void ClosureToken::setMin(const int minVal) {
fMin = minVal;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/ConcatToken.cpp b/src/xercesc/util/regx/ConcatToken.cpp
index 3b96731a1a77017902c24ec82768cf2f73fde009..5be16ead8e7ece89035d071c5e2aab0675e616b2 100644
--- a/src/xercesc/util/regx/ConcatToken.cpp
+++ b/src/xercesc/util/regx/ConcatToken.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/03/18 19:29:53 knoaman
* Change constant names to eliminate possible conflict with user defined ones.
*
@@ -75,6 +78,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/ConcatToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Token: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -91,6 +96,8 @@ ConcatToken::~ConcatToken() {
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file ConcatToken.cpp
*/
diff --git a/src/xercesc/util/regx/ConcatToken.hpp b/src/xercesc/util/regx/ConcatToken.hpp
index 7a525f7896cd44d541547bf2a6e11d4ef0652650..a2e5c20343533b382ae07603ff1badd53f3d6b11 100644
--- a/src/xercesc/util/regx/ConcatToken.hpp
+++ b/src/xercesc/util/regx/ConcatToken.hpp
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/Token.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT ConcatToken : public Token {
public:
@@ -109,6 +110,8 @@ inline Token* ConcatToken::getChild(const int index) const {
return index == 0 ? fChild1 : fChild2;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/ConditionToken.cpp b/src/xercesc/util/regx/ConditionToken.cpp
index 010f920ddfcb5d9c206ca0e91adf4ea56e49e726..79aae9fea263ae83d48a37a12478146fe8308a22 100644
--- a/src/xercesc/util/regx/ConditionToken.cpp
+++ b/src/xercesc/util/regx/ConditionToken.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/03/18 19:29:53 knoaman
* Change constant names to eliminate possible conflict with user defined ones.
*
@@ -75,6 +78,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/ConditionToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ConditionToken: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -94,6 +99,8 @@ ConditionToken::~ConditionToken() {
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file ConditionToken.cpp
*/
diff --git a/src/xercesc/util/regx/ConditionToken.hpp b/src/xercesc/util/regx/ConditionToken.hpp
index 8e7935f936bfbdd95c6166979abbb2037a072688..448618ba222fd240beef21f5a9c5fc5e2c812fc5 100644
--- a/src/xercesc/util/regx/ConditionToken.hpp
+++ b/src/xercesc/util/regx/ConditionToken.hpp
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/Token.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT ConditionToken : public Token {
public:
@@ -130,6 +131,8 @@ inline Token* ConditionToken::getConditionToken() const {
return fConditionToken;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/Match.cpp b/src/xercesc/util/regx/Match.cpp
index 7ad4da4aae516df8c4e99acbc264ef31af1956ff..da431e1955d046d04072a200a2e5776c7865380d 100644
--- a/src/xercesc/util/regx/Match.cpp
+++ b/src/xercesc/util/regx/Match.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:29 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:29 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:26:42 tng
* Copyright update.
@@ -72,6 +75,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/Match.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Match: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -121,6 +126,8 @@ void Match::cleanUp() {
fEndPositions = 0;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file Match.cpp
*/
diff --git a/src/xercesc/util/regx/Match.hpp b/src/xercesc/util/regx/Match.hpp
index cab8636aa0be5dd6485441f1285abf163974317c..849930115adbb72ddbe650c9c44bdcd5270a3f96 100644
--- a/src/xercesc/util/regx/Match.hpp
+++ b/src/xercesc/util/regx/Match.hpp
@@ -67,6 +67,8 @@
#include <xercesc/util/ArrayIndexOutOfBoundsException.hpp>
#include <xercesc/util/RuntimeException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* An instance of this class has ranges captured in matching
*/
@@ -184,4 +186,6 @@ inline void Match::setEndPos(const int index, const int value) {
fEndPositions[index] = value;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/util/regx/ModifierToken.cpp b/src/xercesc/util/regx/ModifierToken.cpp
index aaec2dd1ccc5ba8f44e0975dac5f8befbf678d4a..e4bc22556897a5810e93b6e12659c05ef84f0a6c 100644
--- a/src/xercesc/util/regx/ModifierToken.cpp
+++ b/src/xercesc/util/regx/ModifierToken.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/03/18 19:29:53 knoaman
* Change constant names to eliminate possible conflict with user defined ones.
*
@@ -75,6 +78,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/ModifierToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ModifierToken: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -93,6 +98,8 @@ ModifierToken::~ModifierToken() {
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file ModifierToken.cpp
*/
diff --git a/src/xercesc/util/regx/ModifierToken.hpp b/src/xercesc/util/regx/ModifierToken.hpp
index ef041e777d2e2a25491250e3431a51f0576dc40f..1220df9003a42e67fe1a8ec90bbcbf0aabf4a2f7 100644
--- a/src/xercesc/util/regx/ModifierToken.hpp
+++ b/src/xercesc/util/regx/ModifierToken.hpp
@@ -66,6 +66,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/Token.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLUTIL_EXPORT ModifierToken : public Token {
public:
// -----------------------------------------------------------------------
@@ -121,6 +123,8 @@ inline Token* ModifierToken::getChild(const int) const {
return fChild;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/Op.cpp b/src/xercesc/util/regx/Op.cpp
index 2741f719c54db7bce9870f79ba62b6d1e663372b..d45b053dc96a7a3a9fd8979debfce653f1382c7e 100644
--- a/src/xercesc/util/regx/Op.cpp
+++ b/src/xercesc/util/regx/Op.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:29 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:29 peiyongz
+ * sane_include
*
* Revision 1.3 2001/06/01 14:15:36 knoaman
* Add a return value to satisfy compilers that complain about
@@ -77,6 +80,8 @@
#include <xercesc/util/regx/Op.hpp>
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Op: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -91,7 +96,7 @@ Op::Op(const short type) : fOpType(type),
int Op::getSize() const {
ThrowXML(RuntimeException, XMLExcepts::Regex_NotSupported);
- return 0; // for compilers that complain about no return value
+ return 0; // for compilers that complain about no return value
}
XMLInt32 Op::getData() const {
@@ -315,6 +320,8 @@ const Op* ConditionOp::getNoFlow() const {
return fNoOp;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End file Op.cpp
*/
diff --git a/src/xercesc/util/regx/Op.hpp b/src/xercesc/util/regx/Op.hpp
index beae43db84ac51d56c9825098090b0a887e5db4d..0729a1ad80cdce045f359b734a8d6ad93da24197 100644
--- a/src/xercesc/util/regx/Op.hpp
+++ b/src/xercesc/util/regx/Op.hpp
@@ -68,6 +68,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/RuntimeException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -331,6 +333,8 @@ inline void Op::setNextOp(const Op* const nextOp) {
fNextOp = nextOp;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/OpFactory.cpp b/src/xercesc/util/regx/OpFactory.cpp
index 519f212595e8efc26c09d7e3aa1e1297ab54f1b7..349b6944600f0c58e7019d0be69aba3997bfe342 100644
--- a/src/xercesc/util/regx/OpFactory.cpp
+++ b/src/xercesc/util/regx/OpFactory.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/03/18 19:29:53 knoaman
* Change constant names to eliminate possible conflict with user defined ones.
*
@@ -79,6 +82,7 @@
#include <xercesc/util/regx/OpFactory.hpp>
#include <xercesc/util/regx/Op.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// OpFactory: Constructors and Destructor
@@ -231,6 +235,8 @@ ConditionOp* OpFactory::createConditionOp(const Op* const next, const int ref,
return tmpOp;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file OpFactory.cpp
*/
diff --git a/src/xercesc/util/regx/OpFactory.hpp b/src/xercesc/util/regx/OpFactory.hpp
index d73d82669433341a1a74d544ab125b3ca89f70d9..725feb3e2143d7ffe2683862ecb5e268b265aefb 100644
--- a/src/xercesc/util/regx/OpFactory.hpp
+++ b/src/xercesc/util/regx/OpFactory.hpp
@@ -67,6 +67,8 @@
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/RefVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -154,6 +156,8 @@ inline void OpFactory::reset() {
fOpVector->removeAllElements();
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/ParenToken.cpp b/src/xercesc/util/regx/ParenToken.cpp
index e244ceeaf99fb1cebf97a96ef06f6fe95ad5d9b2..9531c7e0cf0f181544f921f36a9292545477de45 100644
--- a/src/xercesc/util/regx/ParenToken.cpp
+++ b/src/xercesc/util/regx/ParenToken.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:29 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:29 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:26:44 tng
* Copyright update.
@@ -72,6 +75,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/ParenToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ParenToken: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -89,6 +94,8 @@ ParenToken::~ParenToken() {
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file ParenToken.cpp
*/
diff --git a/src/xercesc/util/regx/ParenToken.hpp b/src/xercesc/util/regx/ParenToken.hpp
index 04e0be091dad75f1ab252a8011c8c04ac8bc20aa..b9f4645d0652241560810e2586aa6e4bd0e792ff 100644
--- a/src/xercesc/util/regx/ParenToken.hpp
+++ b/src/xercesc/util/regx/ParenToken.hpp
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/Token.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT ParenToken : public Token {
public:
@@ -116,6 +117,8 @@ inline Token* ParenToken::getChild(const int) const {
return fChild;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/ParserForXMLSchema.cpp b/src/xercesc/util/regx/ParserForXMLSchema.cpp
index 79c2c7975e56fad70ee55f2966634a7f4ffe510c..a3acc920698ce224f2f54d4b866f3e0af7ed7187 100644
--- a/src/xercesc/util/regx/ParserForXMLSchema.cpp
+++ b/src/xercesc/util/regx/ParserForXMLSchema.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/03/18 19:29:53 knoaman
* Change constant names to eliminate possible conflict with user defined ones.
*
@@ -106,6 +109,8 @@
#include <xercesc/util/ParseException.hpp>
#include <xercesc/util/RuntimeException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ParserForXMLSchema: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -545,7 +550,7 @@ XMLInt32 ParserForXMLSchema::decodeEscaped() {
case chCloseSquare:
break;
default:
- {
+ {
XMLCh chString[] = {chBackSlash, ch, chNull};
chString[1] = ch;
ThrowXML1(ParseException,XMLExcepts::Parser_Process2, chString);
@@ -555,6 +560,8 @@ XMLInt32 ParserForXMLSchema::decodeEscaped() {
return ch;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file ParserForXMLSchema.cpp
*/
diff --git a/src/xercesc/util/regx/ParserForXMLSchema.hpp b/src/xercesc/util/regx/ParserForXMLSchema.hpp
index c618596ff3539ab34b1efe5cfdcc6d399862d2cf..79997a361750e4fcd71d15cbf7eb185eef577b70 100644
--- a/src/xercesc/util/regx/ParserForXMLSchema.hpp
+++ b/src/xercesc/util/regx/ParserForXMLSchema.hpp
@@ -66,6 +66,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/RegxParser.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -141,6 +143,8 @@ private:
// -----------------------------------------------------------------------
};
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/RangeFactory.cpp b/src/xercesc/util/regx/RangeFactory.cpp
index 3f007af491f1f2bb3df55b824bdf93111ea49f46..81284cf1782df87643ae00b4c4c60ca1981714e2 100644
--- a/src/xercesc/util/regx/RangeFactory.cpp
+++ b/src/xercesc/util/regx/RangeFactory.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:29 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:29 peiyongz
+ * sane_include
*
* Revision 1.4 2001/05/11 13:26:45 tng
* Copyright update.
@@ -90,6 +93,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/RangeFactory.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// RangeFactory: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -101,6 +106,8 @@ RangeFactory::~RangeFactory() {
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file RangeFactory.cpp
*/
diff --git a/src/xercesc/util/regx/RangeFactory.hpp b/src/xercesc/util/regx/RangeFactory.hpp
index 9c43e988eee89bdc7ab01c461a80981cddecd9c7..a6818e48310aef4399f56ba3124959ddeafdd716 100644
--- a/src/xercesc/util/regx/RangeFactory.hpp
+++ b/src/xercesc/util/regx/RangeFactory.hpp
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT RangeFactory {
@@ -99,6 +100,8 @@ private:
void operator=(const RangeFactory&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/RangeToken.cpp b/src/xercesc/util/regx/RangeToken.cpp
index 74023460900e581ab30dc5e231fa7ef5e48c8e31..a06d3cf04dfb39cc4b2183fcc55c6d75c9d906f3 100644
--- a/src/xercesc/util/regx/RangeToken.cpp
+++ b/src/xercesc/util/regx/RangeToken.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.5 2002/10/15 18:15:02 knoaman
* [Bug 13490]: - new[]/delete mismatch in RangeToken.cpp
*
@@ -104,6 +107,8 @@
#include <xercesc/util/regx/TokenFactory.hpp>
#include <xercesc/util/XMLExceptMsgs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Static member data initialization
// ---------------------------------------------------------------------------
@@ -666,6 +671,9 @@ void RangeToken::createMap() {
}
}
}
+
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file RangeToken.cpp
*/
diff --git a/src/xercesc/util/regx/RangeToken.hpp b/src/xercesc/util/regx/RangeToken.hpp
index 2746e9c164a5990319434487bced4a94da93d155..841de9bef6897c05bb397349135c4f39f8f3474a 100644
--- a/src/xercesc/util/regx/RangeToken.hpp
+++ b/src/xercesc/util/regx/RangeToken.hpp
@@ -66,6 +66,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/Token.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -139,6 +141,7 @@ private:
RangeToken* fCaseIToken;
};
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/util/regx/RangeTokenMap.cpp b/src/xercesc/util/regx/RangeTokenMap.cpp
index 902728d7b4f29f5611d840f830928caed7e82b0f..d4f571260e0efa4fab01eb1cf9e444a98eb8d663 100644
--- a/src/xercesc/util/regx/RangeTokenMap.cpp
+++ b/src/xercesc/util/regx/RangeTokenMap.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:30 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:30 peiyongz
+ * sane_include
*
* Revision 1.5 2001/10/25 15:06:26 tng
* Thread safe the static instance.
@@ -100,6 +103,8 @@
#include <xercesc/util/XMLExceptMsgs.hpp>
#include <xercesc/util/XMLRegisterCleanup.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Static member data initialization
// ---------------------------------------------------------------------------
@@ -302,6 +307,8 @@ void RangeTokenMap::reinitInstance() {
fInstance = 0;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file RangeTokenMap.cpp
*/
diff --git a/src/xercesc/util/regx/RangeTokenMap.hpp b/src/xercesc/util/regx/RangeTokenMap.hpp
index 564c9ce0badf8b9bb92ee3bb40ea3cd5d9e9c8b8..5440e03221d1d7e12e527eba2fca70977c73ec38 100644
--- a/src/xercesc/util/regx/RangeTokenMap.hpp
+++ b/src/xercesc/util/regx/RangeTokenMap.hpp
@@ -67,6 +67,8 @@
#include <xercesc/util/StringPool.hpp>
#include <xercesc/util/Mutexes.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -265,6 +267,8 @@ inline TokenFactory* RangeTokenMap::getTokenFactory() const {
return fTokenFactory;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/RegularExpression.cpp b/src/xercesc/util/regx/RegularExpression.cpp
index f8f5123e731fa5804f7c4d91268ae99191ce8df2..b980972462a7c9593d9086829c3c92656e598f08 100644
--- a/src/xercesc/util/regx/RegularExpression.cpp
+++ b/src/xercesc/util/regx/RegularExpression.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/10/15 18:56:02 knoaman
* [Bug 13604] while loop never terminates.
*
@@ -112,6 +115,7 @@
#include <xercesc/util/Janitor.hpp>
#include <xercesc/util/ParseException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Static member data initialization
@@ -1309,6 +1313,8 @@ unsigned short RegularExpression::getCharType(const XMLCh ch) {
return WT_OTHER;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file RegularExpression.cpp
*/
diff --git a/src/xercesc/util/regx/RegularExpression.hpp b/src/xercesc/util/regx/RegularExpression.hpp
index e05e0c0e67cc5504a8fa7b17bbdd4a01004e8362..d8fe11ad074c424f562066f3d357dd4f929ec2ad 100644
--- a/src/xercesc/util/regx/RegularExpression.hpp
+++ b/src/xercesc/util/regx/RegularExpression.hpp
@@ -74,6 +74,8 @@
#include <xercesc/util/regx/ConditionToken.hpp>
#include <xercesc/util/regx/OpFactory.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -573,6 +575,8 @@ inline bool RegularExpression::matchIgnoreCase(const XMLInt32 ch1,
return (ch1 == ch2);
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
* End of file RegularExpression.hpp
diff --git a/src/xercesc/util/regx/RegxDefs.hpp b/src/xercesc/util/regx/RegxDefs.hpp
index 8fd92d1cf88a6e87272c5db8b3d370fc0ed67ec7..410584c375762bb3f183da3be36a2fdc127876a1 100644
--- a/src/xercesc/util/regx/RegxDefs.hpp
+++ b/src/xercesc/util/regx/RegxDefs.hpp
@@ -67,6 +67,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
const XMLCh fgXMLCategory[] =
{
chLatin_X, chLatin_M, chLatin_L, chNull
@@ -266,6 +268,8 @@ const XMLCh fgUniSymbol[] =
chLatin_S, chNull
};
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/RegxParser.cpp b/src/xercesc/util/regx/RegxParser.cpp
index 65c2a996a6e1c6ce59165a85568a273fc4b2ca63..c723c69c8db3381e28b22e39237375b6ab41f5b1 100644
--- a/src/xercesc/util/regx/RegxParser.cpp
+++ b/src/xercesc/util/regx/RegxParser.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/03/18 19:29:53 knoaman
* Change constant names to eliminate possible conflict with user defined ones.
*
@@ -119,6 +122,8 @@
#include <xercesc/framework/XMLErrorCodes.hpp>
#include <xercesc/util/ParseException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Static member data initialization
// ---------------------------------------------------------------------------
@@ -1506,6 +1511,8 @@ bool RegxParser::checkQuestion(const int off) {
return ((off < fStringLen) && fString[off] == chQuestion);
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End file RegxParser.cpp
*/
diff --git a/src/xercesc/util/regx/RegxParser.hpp b/src/xercesc/util/regx/RegxParser.hpp
index b9e9c840c1e62ab3d83a51897341550d6b6c89a6..21fd15d0684a4b32fa1221008832b075f0d48be3 100644
--- a/src/xercesc/util/regx/RegxParser.hpp
+++ b/src/xercesc/util/regx/RegxParser.hpp
@@ -71,6 +71,8 @@
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/Mutexes.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -316,6 +318,8 @@ inline int RegxParser::hexChar(const XMLInt32 ch) {
return ch - chLatin_a + 10;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/RegxUtil.cpp b/src/xercesc/util/regx/RegxUtil.cpp
index a45d4d603e876bdc67c649138538152ce9a3c608..b67102c9364e3725d8d6a4c22b0c94f63c7b8e80 100644
--- a/src/xercesc/util/regx/RegxUtil.cpp
+++ b/src/xercesc/util/regx/RegxUtil.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:31 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:31 peiyongz
+ * sane_include
*
* Revision 1.3 2001/06/07 20:55:38 tng
* Fix no newline at the end warning. By Pei Yong Zhang.
@@ -76,6 +79,8 @@
#include <xercesc/util/regx/RegxUtil.hpp>
#include <xercesc/framework/XMLBuffer.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
XMLCh* RegxUtil::decomposeToSurrogates(XMLInt32 ch) {
XMLCh* pszStr = new XMLCh[3];
@@ -143,6 +148,9 @@ XMLCh* RegxUtil::stripExtendedComment(const XMLCh* const expression) {
return XMLString::replicate(buffer.getRawBuffer());
}
+
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file RegxUtil.cpp
*/
diff --git a/src/xercesc/util/regx/RegxUtil.hpp b/src/xercesc/util/regx/RegxUtil.hpp
index b71e09afe866655965bf327cea6789dfc0345a7f..9788a1836b74f3d8dc47afef7b2877b96bbe025f 100644
--- a/src/xercesc/util/regx/RegxUtil.hpp
+++ b/src/xercesc/util/regx/RegxUtil.hpp
@@ -67,6 +67,8 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLUTIL_EXPORT RegxUtil {
public:
@@ -123,6 +125,8 @@ inline bool RegxUtil::isWordChar(const XMLCh ch) {
return false;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/StringToken.cpp b/src/xercesc/util/regx/StringToken.cpp
index c585e33f37690c3b98f162aa0734fcb072d525c0..d842f7a39f46a4365ef084814218dbf1234c684f 100644
--- a/src/xercesc/util/regx/StringToken.cpp
+++ b/src/xercesc/util/regx/StringToken.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:31 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:31 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:26:49 tng
* Copyright update.
@@ -72,6 +75,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/StringToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Token: Constructors and Destructors
// ---------------------------------------------------------------------------
@@ -91,6 +96,8 @@ StringToken::~StringToken() {
delete [] fString;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file StringToken.cpp
*/
diff --git a/src/xercesc/util/regx/StringToken.hpp b/src/xercesc/util/regx/StringToken.hpp
index a4e8d0adbdd65cdb038725a97baccd10d83d2014..2ad6e23c5a31a516d26acc5882945839be859316 100644
--- a/src/xercesc/util/regx/StringToken.hpp
+++ b/src/xercesc/util/regx/StringToken.hpp
@@ -67,6 +67,7 @@
#include <xercesc/util/regx/Token.hpp>
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT StringToken : public Token {
public:
@@ -125,6 +126,8 @@ inline void StringToken::setString(const XMLCh* const literal) {
fString = XMLString::replicate(literal);
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/Token.cpp b/src/xercesc/util/regx/Token.cpp
index e9dee102990e657cc16e47c0d25866ddf378cabe..7cd171e7b73dce4b38766c4d4b3ce7b90d129834 100644
--- a/src/xercesc/util/regx/Token.cpp
+++ b/src/xercesc/util/regx/Token.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/10/15 18:11:02 knoaman
* [Bug 13489]: missing 'return' in Token.cpp
*
@@ -96,6 +99,8 @@
#include <xercesc/util/regx/RegularExpression.hpp>
#include <xercesc/util/regx/RegxUtil.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Static member data initialization
// ---------------------------------------------------------------------------
@@ -483,6 +488,8 @@ bool Token::isShorterThan(Token* const tok) {
return length < tokLength;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file Token.cpp
*/
diff --git a/src/xercesc/util/regx/Token.hpp b/src/xercesc/util/regx/Token.hpp
index 470200320f4e54cfa98c8a932ae3a52f403dd35a..c76691233ccaacc6c1f777aa59d8332de9d4e0fa 100644
--- a/src/xercesc/util/regx/Token.hpp
+++ b/src/xercesc/util/regx/Token.hpp
@@ -67,6 +67,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/RuntimeException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -288,6 +290,8 @@ inline void Token::intersectRanges(RangeToken* const) {
ThrowXML(RuntimeException, XMLExcepts::Regex_NotSupported);
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/TokenFactory.cpp b/src/xercesc/util/regx/TokenFactory.cpp
index 9519a68cb58ae3a7ba5b873f86bba7486687ecbe..b6f1d41655db07e5436cad4104dcc21dfc322c39 100644
--- a/src/xercesc/util/regx/TokenFactory.cpp
+++ b/src/xercesc/util/regx/TokenFactory.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:00 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/03/18 19:29:53 knoaman
* Change constant names to eliminate possible conflict with user defined ones.
*
@@ -103,6 +106,7 @@
#include <xercesc/util/regx/RangeTokenMap.hpp>
#include <xercesc/util/regx/RegxDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// TokenFactory: Constructors and Destructor
@@ -505,6 +509,8 @@ void TokenFactory::printUnicode() {
}
*/
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file TokenFactory.cpp
*/
diff --git a/src/xercesc/util/regx/TokenFactory.hpp b/src/xercesc/util/regx/TokenFactory.hpp
index bc2e12253699392aeffd259364b54cd7b118e63e..0349a00b553119d709fbb2eb3fa8249643aac648 100644
--- a/src/xercesc/util/regx/TokenFactory.hpp
+++ b/src/xercesc/util/regx/TokenFactory.hpp
@@ -70,6 +70,8 @@
#include <xercesc/util/regx/Token.hpp>
#include <xercesc/util/Mutexes.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -181,6 +183,7 @@ private:
Token* fGrapheme;
};
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/util/regx/TokenInc.hpp b/src/xercesc/util/regx/TokenInc.hpp
index e7a1235c50405a8c93014bc86b837ec5be639d3c..33866f35bd87377e8af321081c29b852a9795cbf 100644
--- a/src/xercesc/util/regx/TokenInc.hpp
+++ b/src/xercesc/util/regx/TokenInc.hpp
@@ -74,6 +74,8 @@
#include <xercesc/util/regx/StringToken.hpp>
#include <xercesc/util/regx/UnionToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/util/regx/UniCharTable.hpp b/src/xercesc/util/regx/UniCharTable.hpp
index 27c52a87ac319c8e12d8cf620620354b06709f59..f19568ed26d8a907a2a622eaee215e0fd47f0e6b 100644
--- a/src/xercesc/util/regx/UniCharTable.hpp
+++ b/src/xercesc/util/regx/UniCharTable.hpp
@@ -54,6 +54,9 @@
* <http://www.apache.org/>.
*/
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// These are Unicode character type lookup table. The table is used by the
@@ -4160,3 +4163,5 @@ const XMLByte fgUniCharsTable[0x10000] =
, 0x19, 0x19, 0x18, 0x1A, 0x1B, 0x19, 0x19, 0x00, 0x1B, 0x18, 0x18, 0x18, 0x18, 0x1B, 0x1B, 0x00
, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x1B, 0x1B, 0x00, 0x00
};
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/regx/UnicodeRangeFactory.cpp b/src/xercesc/util/regx/UnicodeRangeFactory.cpp
index 8676766e786bbbb212fabef674029d83d2b6014b..bd80b08c5f550e582416af944a230c325dabba4a 100644
--- a/src/xercesc/util/regx/UnicodeRangeFactory.cpp
+++ b/src/xercesc/util/regx/UnicodeRangeFactory.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:01 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/05 13:20:06 tng
* [Bug 5716] Can't parse with Validation more than one file.
*
@@ -98,6 +101,8 @@
#include <xercesc/util/regx/RegxDefs.hpp>
#include <xercesc/util/regx/XMLUniCharacter.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Local data
// ---------------------------------------------------------------------------
@@ -303,6 +308,8 @@ unsigned short UnicodeRangeFactory::getUniCategory(const unsigned short type)
return 0;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file UnicodeRangeFactory.cpp
*/
diff --git a/src/xercesc/util/regx/UnicodeRangeFactory.hpp b/src/xercesc/util/regx/UnicodeRangeFactory.hpp
index be5c1cabd5c17c4ebc1458bdb1e9b1a2bb5991e8..74c351bc922d0ee3e1d100c3f3c51e95448d5664 100644
--- a/src/xercesc/util/regx/UnicodeRangeFactory.hpp
+++ b/src/xercesc/util/regx/UnicodeRangeFactory.hpp
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/RangeFactory.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT UnicodeRangeFactory: public RangeFactory {
@@ -103,6 +104,8 @@ private:
bool fKeywordsInitialized;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/UnionToken.cpp b/src/xercesc/util/regx/UnionToken.cpp
index 6fcd07b62468c3151c9880eb92aaf35397673be5..ee9c264488a11a5588474877d0f9f32efca572d6 100644
--- a/src/xercesc/util/regx/UnionToken.cpp
+++ b/src/xercesc/util/regx/UnionToken.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 15:17:01 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/03/18 19:29:53 knoaman
* Change constant names to eliminate possible conflict with user defined ones.
*
@@ -97,6 +100,8 @@
#include <xercesc/util/regx/TokenFactory.hpp>
#include <xercesc/util/regx/StringToken.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Static member data initialization
// ---------------------------------------------------------------------------
@@ -210,6 +215,8 @@ void UnionToken::addChild(Token* const child, TokenFactory* const tokFactory) {
((StringToken*) previousTok)->setString(stringBuf.getRawBuffer());
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file UnionToken.cpp
*/
diff --git a/src/xercesc/util/regx/UnionToken.hpp b/src/xercesc/util/regx/UnionToken.hpp
index 8a334afa63a94057ab7d7b145a0cc5a6a65bb637..daf25ab0c4c90904ca46d1b50ee0ab3bd97ef501 100644
--- a/src/xercesc/util/regx/UnionToken.hpp
+++ b/src/xercesc/util/regx/UnionToken.hpp
@@ -67,6 +67,7 @@
#include <xercesc/util/regx/Token.hpp>
#include <xercesc/util/RefVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT UnionToken : public Token {
public:
@@ -119,6 +120,8 @@ inline Token* UnionToken::getChild(const int index) const {
return fChildren->elementAt(index);
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/XMLRangeFactory.cpp b/src/xercesc/util/regx/XMLRangeFactory.cpp
index 72ba4db576b57dcc03fede2bc52ae3e2f9e2ac6c..82fb9dc69de6c0e66b02f4c8340ec7c0c16e5986 100644
--- a/src/xercesc/util/regx/XMLRangeFactory.cpp
+++ b/src/xercesc/util/regx/XMLRangeFactory.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 15:17:01 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/05/24 16:42:20 knoaman
* Performance fixes: eliminate mulitple calls to addRange and sort.
*
@@ -103,6 +106,7 @@
#include <xercesc/util/Janitor.hpp>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local static functions
@@ -233,7 +237,7 @@ void XMLRangeFactory::buildRanges() {
tok->sortRanges();
tok->compactRanges();
rangeTokMap->setRangeToken(fgXMLInitialNameChar, tok);
-
+
// Create word range
tok = tokFactory->createRange();
tok->setRangeValues(wordRange, wordRangeLen);
@@ -264,6 +268,8 @@ void XMLRangeFactory::initializeKeywordMap() {
fKeywordsInitialized = true;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file XMLRangeFactory.cpp
*/
diff --git a/src/xercesc/util/regx/XMLRangeFactory.hpp b/src/xercesc/util/regx/XMLRangeFactory.hpp
index 0ac690943f193feaa6a6c41db5eb527ec29eab87..30c209899843c97ad414d75335116e79f870aca4 100644
--- a/src/xercesc/util/regx/XMLRangeFactory.hpp
+++ b/src/xercesc/util/regx/XMLRangeFactory.hpp
@@ -66,6 +66,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/regx/RangeFactory.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class XMLUTIL_EXPORT XMLRangeFactory: public RangeFactory {
@@ -98,6 +99,8 @@ private:
bool fKeywordsInitialized;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/util/regx/XMLUniCharacter.cpp b/src/xercesc/util/regx/XMLUniCharacter.cpp
index 900f4f2f93608cdf75a77a8e36ab4b3ac29d7f36..d28bf7edc0f5155296d0960f62c81ecfb9c10ca9 100644
--- a/src/xercesc/util/regx/XMLUniCharacter.cpp
+++ b/src/xercesc/util/regx/XMLUniCharacter.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:34 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 15:17:01 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:34 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:26:52 tng
* Copyright update.
@@ -79,6 +82,8 @@
#include <xercesc/util/regx/UniCharTable.hpp>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// XMLUniCharacter: Public static methods
// ---------------------------------------------------------------------------
@@ -91,6 +96,8 @@ unsigned short XMLUniCharacter::getType(const XMLCh ch) {
#endif
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file XMLUniCharacter.cpp
*/
diff --git a/src/xercesc/util/regx/XMLUniCharacter.hpp b/src/xercesc/util/regx/XMLUniCharacter.hpp
index a5c9ba6e903140277de1044eb68bf36b02281ec1..528b495a7211a0ea182bddfce148c68b06641562 100644
--- a/src/xercesc/util/regx/XMLUniCharacter.hpp
+++ b/src/xercesc/util/regx/XMLUniCharacter.hpp
@@ -63,6 +63,7 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
/**
* Class for representing unicode characters
@@ -130,6 +131,8 @@ private :
//@}
};
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/DTD/DTDAttDef.cpp b/src/xercesc/validators/DTD/DTDAttDef.cpp
index f43345df72f82643643b9fdf2acee86e2570a16b..65d4ceec882bb18b226d29785f66298b49902dc2 100644
--- a/src/xercesc/validators/DTD/DTDAttDef.cpp
+++ b/src/xercesc/validators/DTD/DTDAttDef.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.3 2000/03/02 19:55:39 roddey
* This checkin includes many changes done while waiting for the
@@ -82,6 +85,7 @@
#include <xercesc/framework/XMLElementDecl.hpp>
#include <xercesc/validators/DTD/DTDAttDef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// DTDAttDef: Constructors and Destructor
@@ -130,3 +134,5 @@ void DTDAttDef::setName(const XMLCh* const newName)
delete [] fName;
fName = XMLString::replicate(newName);
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/DTD/DTDAttDef.hpp b/src/xercesc/validators/DTD/DTDAttDef.hpp
index 3f51ba8e514399f3806f33a63ad8abef1694d76c..2516c6d60eb2fd852e607ff0388d3cfdd43f6158 100644
--- a/src/xercesc/validators/DTD/DTDAttDef.hpp
+++ b/src/xercesc/validators/DTD/DTDAttDef.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.3 2000/02/24 20:16:48 abagchi
* Swat for removing Log from API docs
@@ -79,6 +82,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/framework/XMLAttDef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
//
// This class is a derivative of the core XMLAttDef class. This class adds
@@ -177,4 +181,6 @@ inline void DTDAttDef::setElemId(const unsigned int newId)
fElemId = newId;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/DTD/DTDAttDefList.cpp b/src/xercesc/validators/DTD/DTDAttDefList.cpp
index e4b9b4793328640182b2905d83f961ef622b705a..d0f642caee72be76104c19320017128823940493 100644
--- a/src/xercesc/validators/DTD/DTDAttDefList.cpp
+++ b/src/xercesc/validators/DTD/DTDAttDefList.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.3 2000/03/02 19:55:39 roddey
* This checkin includes many changes done while waiting for the
@@ -81,6 +84,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/DTD/DTDAttDefList.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// DTDAttDefList: Constructors and Destructor
@@ -158,3 +162,5 @@ void DTDAttDefList::Reset()
{
fEnum->Reset();
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/DTD/DTDAttDefList.hpp b/src/xercesc/validators/DTD/DTDAttDefList.hpp
index 38ff6749da85c3532f997d86bc99effce56087cc..c9ecfd434b190550ee08e6a3fc9a8c44789c112b 100644
--- a/src/xercesc/validators/DTD/DTDAttDefList.hpp
+++ b/src/xercesc/validators/DTD/DTDAttDefList.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.3 2000/02/24 20:16:48 abagchi
* Swat for removing Log from API docs
@@ -80,6 +83,7 @@
#include <xercesc/util/RefHashTableOf.hpp>
#include <xercesc/validators/DTD/DTDElementDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
//
// This is a derivative of the framework abstract class which defines the
@@ -157,4 +161,6 @@ private :
RefHashTableOf<DTDAttDef>* fList;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/DTD/DTDElementDecl.cpp b/src/xercesc/validators/DTD/DTDElementDecl.cpp
index d13406f8ea4b775509dfc8d4116c22677580b7df..ca10c250d9cfa02eed7ab5cb7a738ce62c904287 100644
--- a/src/xercesc/validators/DTD/DTDElementDecl.cpp
+++ b/src/xercesc/validators/DTD/DTDElementDecl.cpp
@@ -73,6 +73,7 @@
#include <xercesc/validators/DTD/DTDAttDefList.hpp>
#include <xercesc/validators/DTD/DTDElementDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// DTDElementDecl: Constructors and Destructor
@@ -83,8 +84,8 @@ DTDElementDecl::DTDElementDecl() :
, fAttList(0)
, fContentSpec(0)
, fModelType(Any)
- , fContentModel(0)
- , fFormattedModel(0)
+ , fContentModel(0)
+ , fFormattedModel(0)
{
}
@@ -95,8 +96,8 @@ DTDElementDecl::DTDElementDecl( const XMLCh* const elemRawName
, fAttList(0)
, fContentSpec(0)
, fModelType(type)
- , fContentModel(0)
- , fFormattedModel(0)
+ , fContentModel(0)
+ , fFormattedModel(0)
{
setElementName(elemRawName, uriId);
}
@@ -107,8 +108,8 @@ DTDElementDecl::DTDElementDecl( QName* const elementName
, fAttList(0)
, fContentSpec(0)
, fModelType(type)
- , fContentModel(0)
- , fFormattedModel(0)
+ , fContentModel(0)
+ , fFormattedModel(0)
{
setElementName(elementName);
}
@@ -118,8 +119,8 @@ DTDElementDecl::~DTDElementDecl()
delete fAttDefs;
delete fAttList;
delete fContentSpec;
- delete fContentModel;
- delete [] fFormattedModel;
+ delete fContentModel;
+ delete [] fFormattedModel;
}
@@ -436,3 +437,5 @@ void DTDElementDecl::faultInAttDefList() const
// Use a hash modulus of 29 and tell it owns its elements
((DTDElementDecl*)this)->fAttDefs = new RefHashTableOf<DTDAttDef>(29, true);
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/DTD/DTDElementDecl.hpp b/src/xercesc/validators/DTD/DTDElementDecl.hpp
index 188a90848eac83be5e23a958d4b00c7a4cfa2063..cc4d1d05454396314042038727e669fc44234868 100644
--- a/src/xercesc/validators/DTD/DTDElementDecl.hpp
+++ b/src/xercesc/validators/DTD/DTDElementDecl.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.12 2001/09/05 20:49:10 knoaman
* Fix for complexTypes with mixed content model.
@@ -110,6 +113,8 @@
#include <xercesc/framework/XMLContentModel.hpp>
#include <xercesc/validators/DTD/DTDAttDef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentSpecNode;
class DTDAttDefList;
@@ -184,8 +189,8 @@ public :
virtual ContentSpecNode* getContentSpec();
virtual void setContentSpec(ContentSpecNode* toAdopt);
virtual XMLContentModel* getContentModel();
- virtual void setContentModel(XMLContentModel* const newModelToAdopt);
- virtual const XMLCh* getFormattedContentModel () const;
+ virtual void setContentModel(XMLContentModel* const newModelToAdopt);
+ virtual const XMLCh* getFormattedContentModel () const;
// -----------------------------------------------------------------------
// Support keyed collections
@@ -215,10 +220,10 @@ private :
// -----------------------------------------------------------------------
// Private helper methods
// -----------------------------------------------------------------------
- void faultInAttDefList() const;
+ void faultInAttDefList() const;
XMLContentModel* createChildModel() ;
XMLContentModel* makeContentModel() ;
- XMLCh* formatContentModel () const ;
+ XMLCh* formatContentModel () const ;
// -----------------------------------------------------------------------
@@ -247,19 +252,19 @@ private :
//
// fContentModel
// The content model object for this element. It is stored here via
- // its abstract interface.
+ // its abstract interface.
//
// fFormattedModel
// This is a faulted in member. When the outside world asks for
// our content model as a string, we format it and fault it into
- // this field (to avoid doing the formatted over and over.)
+ // this field (to avoid doing the formatted over and over.)
// -----------------------------------------------------------------------
RefHashTableOf<DTDAttDef>* fAttDefs;
DTDAttDefList* fAttList;
ContentSpecNode* fContentSpec;
ModelTypes fModelType;
- XMLContentModel* fContentModel;
- XMLCh* fFormattedModel;
+ XMLContentModel* fContentModel;
+ XMLCh* fFormattedModel;
};
// ---------------------------------------------------------------------------
@@ -315,4 +320,6 @@ DTDElementDecl::setModelType(const DTDElementDecl::ModelTypes toSet)
fModelType = toSet;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/DTD/DTDEntityDecl.hpp b/src/xercesc/validators/DTD/DTDEntityDecl.hpp
index c2e218a8bc0f230df186e1b239e6c0b5de9ff59d..b4c7a7385d8e333c9727111c3d03f188a8bc3996 100644
--- a/src/xercesc/validators/DTD/DTDEntityDecl.hpp
+++ b/src/xercesc/validators/DTD/DTDEntityDecl.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.4 2000/02/24 20:16:49 abagchi
* Swat for removing Log from API docs
@@ -83,6 +86,7 @@
#include <xercesc/framework/XMLEntityDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
//
// This is a derivative of the abstract version of an entity decl in the
@@ -248,4 +252,6 @@ inline void DTDEntityDecl::setIsSpecialChar(const bool newValue)
fIsSpecialChar = newValue;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/DTD/DTDGrammar.cpp b/src/xercesc/validators/DTD/DTDGrammar.cpp
index 477fd3a95d3ccd28a602bd48ab4f445107e42a93..9aa0eb173567071355eb487e3f94b6e9496c9fdd 100644
--- a/src/xercesc/validators/DTD/DTDGrammar.cpp
+++ b/src/xercesc/validators/DTD/DTDGrammar.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/07/11 18:19:28 knoaman
* Grammar caching/preparsing - initial implementation.
*
@@ -84,6 +87,8 @@
#include <xercesc/util/XMLUni.hpp>
#include <xercesc/validators/DTD/DTDGrammar.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Local const data
//
@@ -204,4 +209,6 @@ void DTDGrammar::resetEntityDeclPool() {
fEntityDeclPool->put(new DTDEntityDecl(gGT, chCloseAngle, true, true));
fEntityDeclPool->put(new DTDEntityDecl(gQuot, chDoubleQuote, true, true));
fEntityDeclPool->put(new DTDEntityDecl(gApos, chSingleQuote, true, true));
-}
\ No newline at end of file
+}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/DTD/DTDGrammar.hpp b/src/xercesc/validators/DTD/DTDGrammar.hpp
index 549a1917ae668b75a6b0bd764b9140075edc336f..bb89f4cdbb33d34eba6f22590510e7337f9ce626 100644
--- a/src/xercesc/validators/DTD/DTDGrammar.hpp
+++ b/src/xercesc/validators/DTD/DTDGrammar.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/08/22 15:05:39 tng
* Remove unused parameter variables in inline functions.
*
@@ -97,6 +100,8 @@
#include <xercesc/validators/DTD/DTDElementDecl.hpp>
#include <xercesc/validators/DTD/DTDEntityDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This class stores the DTD information
// NOTE: DTDs are not namespace aware, so we just use regular NameIdPool
@@ -437,4 +442,6 @@ inline void DTDGrammar::setValidated(const bool newState)
fValidated = newState;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/DTD/DTDScanner.cpp b/src/xercesc/validators/DTD/DTDScanner.cpp
index 4608efcf6eab93dc1d381ab5c9ef189ed93b16a3..91931bfa3ce34b0435b92143b01e0e8d30d562ac 100644
--- a/src/xercesc/validators/DTD/DTDScanner.cpp
+++ b/src/xercesc/validators/DTD/DTDScanner.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.14 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.13 2002/09/24 20:10:30 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -196,6 +199,8 @@
#include <xercesc/validators/DTD/DocTypeHandler.hpp>
#include <xercesc/validators/DTD/DTDScanner.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Local methods
// ---------------------------------------------------------------------------
@@ -3742,3 +3747,5 @@ void DTDScanner::scanTextDecl()
fScanner->emitError(XMLErrs::ContradictoryEncoding, bbEncoding.getRawBuffer());
}
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/DTD/DTDScanner.hpp b/src/xercesc/validators/DTD/DTDScanner.hpp
index 8956008cac69e05adb7e5fcd7f2fc3ca346800fa..9b795a2d96e1294ae65af7d0c112786ad8ba9f29 100644
--- a/src/xercesc/validators/DTD/DTDScanner.hpp
+++ b/src/xercesc/validators/DTD/DTDScanner.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/07/11 18:39:48 knoaman
* Access entities through the DTDGrammar instead of the scanner.
*
@@ -87,6 +90,8 @@
#include <xercesc/validators/DTD/DTDGrammar.hpp>
#include <xercesc/validators/DTD/DTDEntityDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/*
* Default implementation of an XML DTD scanner.
*/
@@ -339,4 +344,6 @@ inline bool DTDScanner::isReadingExternalEntity() {
return (fDocTypeReaderId != fReaderMgr->getCurrentReaderNum());
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/DTD/DTDValidator.cpp b/src/xercesc/validators/DTD/DTDValidator.cpp
index 51b96934b98c5005839705f9c420dc059ef192b2..37513c05e44cd88a29601e8c663e9b70ed6a0ced 100644
--- a/src/xercesc/validators/DTD/DTDValidator.cpp
+++ b/src/xercesc/validators/DTD/DTDValidator.cpp
@@ -69,6 +69,8 @@
#include <xercesc/internal/XMLScanner.hpp>
#include <xercesc/validators/DTD/DTDValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// DTDValidator: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -621,3 +623,5 @@ void DTDValidator::postParseValidation()
// validator.
//
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/DTD/DTDValidator.hpp b/src/xercesc/validators/DTD/DTDValidator.hpp
index f8af0195a683c876571eb28d1dfaff2003628c33..679ebc9b5ad77eb2ac5662e073ec56389b1c0b4e 100644
--- a/src/xercesc/validators/DTD/DTDValidator.hpp
+++ b/src/xercesc/validators/DTD/DTDValidator.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/09/04 18:17:49 tng
* Do not set IDREF to used during prevalidation.
*
@@ -128,6 +131,8 @@
#include <xercesc/framework/XMLValidator.hpp>
#include <xercesc/validators/DTD/DTDGrammar.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class XMLMsgLoader;
@@ -240,4 +245,6 @@ inline bool DTDValidator::handlesSchema() const
return false;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/DTD/DocTypeHandler.hpp b/src/xercesc/validators/DTD/DocTypeHandler.hpp
index ede4202fc8621047d84d52ca379390f598678e6c..77f283ba4aaacee1cbafe2e5d5f1b9c5447e1e68 100644
--- a/src/xercesc/validators/DTD/DocTypeHandler.hpp
+++ b/src/xercesc/validators/DTD/DocTypeHandler.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:50:40 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/14 15:20:38 knoaman
* [Bug 3111] Problem with LexicalHandler::startDTD() and LexicalHandler::endDTD().
*
@@ -95,6 +98,7 @@
#include <xercesc/validators/DTD/DTDElementDecl.hpp>
#include <xercesc/validators/DTD/DTDEntityDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
//
// This abstract class defines the document type handler API's which can be
@@ -206,4 +210,6 @@ private:
void operator=(const DocTypeHandler&);
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/common/AllContentModel.cpp b/src/xercesc/validators/common/AllContentModel.cpp
index 06c02e0d4412be873bf8c163fb0800aaac470c85..33b2ad84434edca565b03c45d6d468997e04961e 100644
--- a/src/xercesc/validators/common/AllContentModel.cpp
+++ b/src/xercesc/validators/common/AllContentModel.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 19:48:39 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -85,6 +88,8 @@
#include <xercesc/validators/schema/SubstitutionGroupComparator.hpp>
#include <xercesc/validators/schema/XercesElementWildcard.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// AllContentModel: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -380,3 +385,4 @@ AllContentModel::buildChildList(ContentSpecNode* const curNode
ThrowXML(RuntimeException, XMLExcepts::CM_UnknownCMSpecType);
}
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/common/AllContentModel.hpp b/src/xercesc/validators/common/AllContentModel.hpp
index 12fd9f7223b75b1c8672be064390b99161299e59..6ef6cf0e09bec1a1fddf4fdac1593aa173381513 100644
--- a/src/xercesc/validators/common/AllContentModel.hpp
+++ b/src/xercesc/validators/common/AllContentModel.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:37 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:37 peiyongz
+ * sane_include
*
* Revision 1.2 2001/11/21 14:30:13 knoaman
* Fix for UPA checking.
@@ -75,6 +78,8 @@
#include <xercesc/framework/XMLContentModel.hpp>
#include <xercesc/validators/common/ContentLeafNameTypeVector.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentSpecNode;
//
@@ -192,5 +197,7 @@ AllContentModel::getNextState(const unsigned int currentState,
return XMLContentModel::gInvalidTrans;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/common/CMAny.cpp b/src/xercesc/validators/common/CMAny.cpp
index 397c8e2dc919e6c36db31e47a4d04af61901c1ba..3224ed4b5d99860a28c85505b0bb3a37c51b2d17 100644
--- a/src/xercesc/validators/common/CMAny.cpp
+++ b/src/xercesc/validators/common/CMAny.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:37 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:37 peiyongz
+ * sane_include
*
* Revision 1.6 2001/08/08 13:23:27 knoaman
* Fix condition check.
@@ -87,6 +90,8 @@
#include <xercesc/validators/common/CMStateSet.hpp>
#include <xercesc/validators/common/CMAny.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// CMUnaryOp: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -168,3 +173,5 @@ void CMAny::calcLastPos(CMStateSet& toSet) const
return;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/common/CMAny.hpp b/src/xercesc/validators/common/CMAny.hpp
index b5c930d614bb925b3a0f257ea666dafe26c6eac3..44bdb6899dcfd696615c6c4e33a0fd67e54e8954 100644
--- a/src/xercesc/validators/common/CMAny.hpp
+++ b/src/xercesc/validators/common/CMAny.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:37 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:37 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:27:14 tng
* Copyright update.
@@ -73,6 +76,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/validators/common/CMNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class CMStateSet;
class CMAny : public CMNode
@@ -133,4 +138,6 @@ private :
unsigned int fPosition;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/common/CMBinaryOp.cpp b/src/xercesc/validators/common/CMBinaryOp.cpp
index f1d7facd9a2e499182725ce3a006536fecbb8506..3f9e5ff42b37e354ff3ea1af10d15e0f56c21052 100644
--- a/src/xercesc/validators/common/CMBinaryOp.cpp
+++ b/src/xercesc/validators/common/CMBinaryOp.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:37 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:37 peiyongz
+ * sane_include
*
* Revision 1.3 2001/05/11 13:27:15 tng
* Copyright update.
@@ -96,6 +99,7 @@
#include <xercesc/validators/common/CMBinaryOp.hpp>
#include <xercesc/validators/common/CMStateSet.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// CMBinaryOp: Constructors
@@ -207,3 +211,5 @@ void CMBinaryOp::calcLastPos(CMStateSet& toSet) const
toSet |= fLeftChild->getLastPos();
}
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/common/CMBinaryOp.hpp b/src/xercesc/validators/common/CMBinaryOp.hpp
index 7532e86798e5c62ac255a9eafcd878b6e9589c75..72fd139b31bb50e176f59618f42593a931f6b230 100644
--- a/src/xercesc/validators/common/CMBinaryOp.hpp
+++ b/src/xercesc/validators/common/CMBinaryOp.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:37 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:37 peiyongz
+ * sane_include
*
* Revision 1.3 2001/05/11 13:27:16 tng
* Copyright update.
@@ -95,6 +98,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/validators/common/CMNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class CMStateSet;
class CMBinaryOp : public CMNode
@@ -148,4 +153,6 @@ private :
CMNode* fRightChild;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/common/CMLeaf.hpp b/src/xercesc/validators/common/CMLeaf.hpp
index 64f725987f259aecc409b95499ca4607810e93b0..b334d6b960d90532e0557b65ada4d40faf1bd28b 100644
--- a/src/xercesc/validators/common/CMLeaf.hpp
+++ b/src/xercesc/validators/common/CMLeaf.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:37 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:37 peiyongz
+ * sane_include
*
* Revision 1.6 2001/12/06 17:52:17 tng
* Performance Enhancement. The QName that was passed to the CMLeaf
@@ -117,6 +120,8 @@
#include <xercesc/validators/common/CMNode.hpp>
#include <xercesc/validators/common/CMStateSet.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This class represents a leaf in the content spec node tree of an
// element's content model. It just has an element qname and a position value,
@@ -311,4 +316,6 @@ inline void CMLeaf::calcLastPos(CMStateSet& toSet) const
toSet.setBit(fPosition);
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/common/CMNode.hpp b/src/xercesc/validators/common/CMNode.hpp
index abc9992aa3bcf364ab8908100a222c579093199c..c308767fe5b02c6b003f85566e0fa1873a28b231 100644
--- a/src/xercesc/validators/common/CMNode.hpp
+++ b/src/xercesc/validators/common/CMNode.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:38 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:38 peiyongz
+ * sane_include
*
* Revision 1.3 2001/05/11 13:27:17 tng
* Copyright update.
@@ -100,6 +103,7 @@
#include <xercesc/validators/common/ContentSpecNode.hpp>
#include <xercesc/validators/common/CMStateSet.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class CMNode
{
@@ -245,4 +249,6 @@ inline void CMNode::setMaxStates(const unsigned int maxStates)
fMaxStates = maxStates;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/common/CMStateSet.hpp b/src/xercesc/validators/common/CMStateSet.hpp
index ac6cb5f8f484a3522d0c5c063cf958473567746e..76e14c6decdfc943e578aa21a8789a4dacea0710 100644
--- a/src/xercesc/validators/common/CMStateSet.hpp
+++ b/src/xercesc/validators/common/CMStateSet.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/07/16 12:50:08 tng
* [Bug 10651] CMStateSet.hpp includes both memory.h and string.h.
*
@@ -114,6 +117,7 @@
#include <xercesc/framework/XMLValidityCodes.hpp>
#include <string.h>
+XERCES_CPP_NAMESPACE_BEGIN
class CMStateSet
{
@@ -390,4 +394,6 @@ private :
XMLByte* fByteArray;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/common/CMUnaryOp.cpp b/src/xercesc/validators/common/CMUnaryOp.cpp
index 9793f41f208edb848f70d9d361a396a336b2da2c..55ccfa2ad532fe3a57a555bf762d711ecd9809fa 100644
--- a/src/xercesc/validators/common/CMUnaryOp.cpp
+++ b/src/xercesc/validators/common/CMUnaryOp.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:38 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:38 peiyongz
+ * sane_include
*
* Revision 1.4 2001/05/11 13:27:17 tng
* Copyright update.
@@ -98,6 +101,7 @@
#include <xercesc/validators/common/CMStateSet.hpp>
#include <xercesc/validators/common/CMUnaryOp.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// CMUnaryOp: Constructors and Destructor
@@ -162,3 +166,5 @@ void CMUnaryOp::calcLastPos(CMStateSet& toSet) const
// Its just based on our child node's last pos
toSet = fChild->getLastPos();
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/common/CMUnaryOp.hpp b/src/xercesc/validators/common/CMUnaryOp.hpp
index 9020697e59d3695b07289835e7c7f546c240b6f2..ca7b0b12e0aa937126300533cc4409dfe4b82cf5 100644
--- a/src/xercesc/validators/common/CMUnaryOp.hpp
+++ b/src/xercesc/validators/common/CMUnaryOp.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:38 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:38 peiyongz
+ * sane_include
*
* Revision 1.3 2001/05/11 13:27:17 tng
* Copyright update.
@@ -97,6 +100,8 @@
#include <xercesc/validators/common/CMNode.hpp>
#include <xercesc/validators/common/ContentSpecNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class CMStateSet;
class CMUnaryOp : public CMNode
@@ -145,4 +150,6 @@ private :
CMNode* fChild;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/common/ContentLeafNameTypeVector.cpp b/src/xercesc/validators/common/ContentLeafNameTypeVector.cpp
index 30675d6e174c1ac9bf7a4cb069b5c276e1883831..a8b235473a5957d8c6352db1259ad9af2e0d6b75 100644
--- a/src/xercesc/validators/common/ContentLeafNameTypeVector.cpp
+++ b/src/xercesc/validators/common/ContentLeafNameTypeVector.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:38 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:38 peiyongz
+ * sane_include
*
* Revision 1.3 2001/05/11 13:27:17 tng
* Copyright update.
@@ -77,6 +80,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/validators/common/ContentLeafNameTypeVector.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ContentLeafNameTypeVector: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -167,3 +172,5 @@ const unsigned int ContentLeafNameTypeVector::getLeafCount() const
{
return fLeafCount;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/common/ContentLeafNameTypeVector.hpp b/src/xercesc/validators/common/ContentLeafNameTypeVector.hpp
index 70da01144dae3c1b3d85ae6bbe08b5c582a172e2..b395b3fd7eb734fc4e69d6c2011df6ce36603e9d 100644
--- a/src/xercesc/validators/common/ContentLeafNameTypeVector.hpp
+++ b/src/xercesc/validators/common/ContentLeafNameTypeVector.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:38 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:38 peiyongz
+ * sane_include
*
* Revision 1.4 2001/08/07 15:21:20 knoaman
* The value of 'fLeafCount' was not set.
@@ -81,6 +84,8 @@
#include <xercesc/util/ValueVectorOf.hpp>
#include <xercesc/validators/common/ContentSpecNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentLeafNameTypeVector
{
public :
@@ -160,4 +165,6 @@ inline void ContentLeafNameTypeVector::init(const unsigned int size)
fLeafCount = size;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/common/ContentSpecNode.cpp b/src/xercesc/validators/common/ContentSpecNode.cpp
index 5ca3606760e2580bda27cfaeb38cb33179f1a62f..8186b86c00682f31f202203326743954a19b04a4 100644
--- a/src/xercesc/validators/common/ContentSpecNode.cpp
+++ b/src/xercesc/validators/common/ContentSpecNode.cpp
@@ -71,6 +71,8 @@
#include <xercesc/validators/DTD/DTDValidator.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ContentSpecNode: Copy Constructor
//
@@ -301,3 +303,5 @@ int ContentSpecNode::getMaxTotalRange() const {
return max;
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/validators/common/ContentSpecNode.hpp b/src/xercesc/validators/common/ContentSpecNode.hpp
index e5d3b9620fc34d5fbc321aa72010d574bcaf8d69..8b5795636941e5d2e7ee96a377bc9ff73c708321 100644
--- a/src/xercesc/validators/common/ContentSpecNode.hpp
+++ b/src/xercesc/validators/common/ContentSpecNode.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/10/30 21:52:00 tng
* [Bug 13641] compiler-generated copy-constructor for QName doesn't do the right thing.
*
@@ -155,8 +158,10 @@
#if !defined(CONTENTSPECNODE_HPP)
#define CONTENTSPECNODE_HPP
-#include <xercesc/framework/XMLElementDecl.hpp>
#include <xercesc/util/XercesDefs.hpp>
+#include <xercesc/framework/XMLElementDecl.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
class XMLBuffer;
class Grammar;
@@ -525,4 +530,6 @@ inline bool ContentSpecNode::hasAllContent() {
return (fType == ContentSpecNode::All);
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/common/DFAContentModel.cpp b/src/xercesc/validators/common/DFAContentModel.cpp
index 7ccfd0f0c9d94de4810bb9a356b1f3c3d0f0bbfc..f7f5efec7c9152feb7acb608cc18b9fa4c990fd3 100644
--- a/src/xercesc/validators/common/DFAContentModel.cpp
+++ b/src/xercesc/validators/common/DFAContentModel.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/24 19:48:39 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -213,6 +216,8 @@
#include <xercesc/util/HashCMStateSet.hpp>
#include <xercesc/util/XMLInteger.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// DFAContentModel: Constructors and Destructor
@@ -1274,3 +1279,5 @@ void DFAContentModel::checkUniqueParticleAttribution (SchemaGrammar* const pG
delete [] fConflictTable;
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/validators/common/DFAContentModel.hpp b/src/xercesc/validators/common/DFAContentModel.hpp
index b32133f9ef5f2972b445e27578f0882ecd1da150..16ed4b70cf6c61b27939ba238f791661f2fcf8a5 100644
--- a/src/xercesc/validators/common/DFAContentModel.hpp
+++ b/src/xercesc/validators/common/DFAContentModel.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:38 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:38 peiyongz
+ * sane_include
*
* Revision 1.13 2001/11/21 14:30:13 knoaman
* Fix for UPA checking.
@@ -126,6 +129,8 @@
#include <xercesc/framework/XMLContentModel.hpp>
#include <xercesc/validators/common/ContentLeafNameTypeVector.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentSpecNode;
class CMLeaf;
class CMNode;
@@ -326,5 +331,7 @@ DFAContentModel::getNextState(const unsigned int currentState,
return fTransTable[currentState][elementIndex];
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/common/Grammar.hpp b/src/xercesc/validators/common/Grammar.hpp
index 8afdd01f4b65ac594080f6506429dde9c77e2533..e401208e13bb935fa2ced89785fc8668a38ee2bd 100644
--- a/src/xercesc/validators/common/Grammar.hpp
+++ b/src/xercesc/validators/common/Grammar.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/07/11 18:17:43 knoaman
* Grammar caching/preparsing - initial implementation.
*
@@ -94,6 +97,8 @@
#include <xercesc/framework/XMLEntityDecl.hpp>
#include <xercesc/framework/XMLNotationDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This abstract class specifies the interface for a Grammar
//
@@ -232,4 +237,6 @@ protected :
Grammar() {};
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/common/GrammarResolver.cpp b/src/xercesc/validators/common/GrammarResolver.cpp
index 2d63b4c34013b32140446343e57a27cdde84af20..bd45486cd48c3d2644b1dbb7ed44ab197fbc895c 100644
--- a/src/xercesc/validators/common/GrammarResolver.cpp
+++ b/src/xercesc/validators/common/GrammarResolver.cpp
@@ -57,6 +57,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/09/24 19:48:39 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -91,6 +94,8 @@
#include <xercesc/validators/schema/SchemaSymbols.hpp>
#include <xercesc/validators/schema/SchemaGrammar.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// GrammarResolver: Constructor and Destructor
// ---------------------------------------------------------------------------
@@ -242,3 +247,5 @@ void GrammarResolver::cacheGrammarFromParse(const bool aValue) {
fGrammarRegistry->removeAll();
fGrammarRegistry->setAdoptElements(!fCacheGrammar);
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/common/GrammarResolver.hpp b/src/xercesc/validators/common/GrammarResolver.hpp
index 0172a187b2cd1cd95bbed64c70d9c0a88a95d6a1..17a6476a3dda7428254864f7def1fd0cfa456768 100644
--- a/src/xercesc/validators/common/GrammarResolver.hpp
+++ b/src/xercesc/validators/common/GrammarResolver.hpp
@@ -66,6 +66,8 @@
#include <xercesc/util/StringPool.hpp>
#include <xercesc/validators/common/Grammar.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class DatatypeValidator;
class DatatypeValidatorFactory;
@@ -235,4 +237,6 @@ GrammarResolver::orphanGrammar(const XMLCh* const nameSpaceKey) {
return fGrammarRegistry->orphanKey(nameSpaceKey);
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/common/MixedContentModel.cpp b/src/xercesc/validators/common/MixedContentModel.cpp
index 96cc8d16f7a27484d28d3b12e9a4c0dca60408c9..9886387f9f90d6280e0fb22059362b9b7ac0324c 100644
--- a/src/xercesc/validators/common/MixedContentModel.cpp
+++ b/src/xercesc/validators/common/MixedContentModel.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 19:48:39 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -138,6 +141,8 @@
#include <xercesc/validators/common/Grammar.hpp>
#include <xercesc/validators/schema/SubstitutionGroupComparator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// MixedContentModel: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -482,3 +487,5 @@ MixedContentModel::buildChildList( ContentSpecNode* const curNode
}
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/validators/common/MixedContentModel.hpp b/src/xercesc/validators/common/MixedContentModel.hpp
index 978d9abf82f0f37ab2533c67e95d1bc7fd085e3b..c75d19d84ca1817406dee401e2e4264cd7f29a21 100644
--- a/src/xercesc/validators/common/MixedContentModel.hpp
+++ b/src/xercesc/validators/common/MixedContentModel.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/25 21:18:53 tng
* Schema Fix: Ensure no invalid uri index for UPA checking.
*
@@ -121,6 +124,8 @@
#include <xercesc/framework/XMLContentModel.hpp>
#include <xercesc/validators/common/ContentLeafNameTypeVector.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentSpecNode;
//
@@ -272,4 +277,7 @@ inline void MixedContentModel::checkUniqueParticleAttribution
// for mixed content model, it's only a sequence
// UPA checking is not necessary
}
+
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/common/SimpleContentModel.cpp b/src/xercesc/validators/common/SimpleContentModel.cpp
index a7b1b33106a2e39bed48f001bdd65f1659b5a582..bba2f648957bbddb99abcd45ce69bd7f85278486 100644
--- a/src/xercesc/validators/common/SimpleContentModel.cpp
+++ b/src/xercesc/validators/common/SimpleContentModel.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/24 19:48:39 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -130,6 +133,7 @@
#include <xercesc/validators/schema/SubstitutionGroupComparator.hpp>
#include <xercesc/validators/schema/XercesElementWildcard.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// SimpleContentModel: Implementation of the ContentModel virtual interface
@@ -534,3 +538,5 @@ void SimpleContentModel::checkUniqueParticleAttribution
}
}
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/validators/common/SimpleContentModel.hpp b/src/xercesc/validators/common/SimpleContentModel.hpp
index b6db57ca031f3e8cc505cec3c0a7123361e9dba2..4257d3898fca93b002e488ca7dc2bd0f56ce9641 100644
--- a/src/xercesc/validators/common/SimpleContentModel.hpp
+++ b/src/xercesc/validators/common/SimpleContentModel.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:54:58 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/10/30 21:52:00 tng
* [Bug 13641] compiler-generated copy-constructor for QName doesn't do the right thing.
*
@@ -121,6 +124,8 @@
#include <xercesc/framework/XMLContentModel.hpp>
#include <xercesc/validators/common/ContentSpecNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// SimpleContentModel is a derivative of the abstract content model base
// class that handles a small set of simple content models that are just
@@ -271,4 +276,6 @@ SimpleContentModel::getNextState(const unsigned int currentState,
return XMLContentModel::gInvalidTrans;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/datatype/AbstractNumericFacetValidator.cpp b/src/xercesc/validators/datatype/AbstractNumericFacetValidator.cpp
index c11737007a99f1c7c800f22447258a914493432f..5c747f6b30dd35163a08eab3d4872980c1bff7d7 100644
--- a/src/xercesc/validators/datatype/AbstractNumericFacetValidator.cpp
+++ b/src/xercesc/validators/datatype/AbstractNumericFacetValidator.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.5 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -98,6 +101,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp>
#include <xercesc/util/NumberFormatException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
const int AbstractNumericFacetValidator::INDETERMINATE = 2;
#define REPORT_FACET_ERROR(val1, val2, except_code) \
@@ -798,6 +803,8 @@ const RefVectorOf<XMLCh>* AbstractNumericFacetValidator::getEnumString() const
return (fEnumerationInherited? getBaseValidator()->getEnumString() : fStrEnumeration );
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file AbstractNumericFacetValidator::cpp
*/
diff --git a/src/xercesc/validators/datatype/AbstractNumericFacetValidator.hpp b/src/xercesc/validators/datatype/AbstractNumericFacetValidator.hpp
index 66768503c6c6b745fdbf7ddaa206fcf04e278ff4..97bdb3a522889fdc6abb7bbaab8e9713040a4ff2 100644
--- a/src/xercesc/validators/datatype/AbstractNumericFacetValidator.hpp
+++ b/src/xercesc/validators/datatype/AbstractNumericFacetValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.4 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/10/18 16:52:14 peiyongz
* Patch to Bug#13640: Getter methods not public in
* DecimalDatatypeValidator
@@ -85,6 +88,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/XMLNumber.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT AbstractNumericFacetValidator : public DatatypeValidator
{
public:
@@ -164,7 +169,7 @@ protected:
// Protected data members
//
// Allow access to derived class
- //
+ //
// -----------------------------------------------------------------------
bool fMaxInclusiveInherited;
bool fMaxExclusiveInherited;
@@ -189,7 +194,7 @@ private:
void inspectFacetBase();
void inheritFacet();
-
+
};
// -----------------------------------------------------------------------
@@ -221,7 +226,10 @@ inline RefVectorOf<XMLNumber>* AbstractNumericFacetValidator::getEnumeration() c
return fEnumeration;
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file AbstractNumericFacetValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/AbstractNumericValidator.cpp b/src/xercesc/validators/datatype/AbstractNumericValidator.cpp
index ab6bda281fdafc1116f51db0b43f970db1befda3..2675d7268b75243cb443dbd5d79063cf79ad315c 100644
--- a/src/xercesc/validators/datatype/AbstractNumericValidator.cpp
+++ b/src/xercesc/validators/datatype/AbstractNumericValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:39 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:39 peiyongz
+ * sane_include
*
* Revision 1.2 2001/10/09 21:16:31 peiyongz
* . macro to simplify code
@@ -74,6 +77,8 @@
#include <xercesc/validators/datatype/AbstractNumericValidator.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
#define REPORT_VALUE_ERROR(val1, val2, except_code) \
XMLCh* value1 = (val1)->toString(); \
ArrayJanitor<XMLCh> jan1(value1); \
@@ -82,7 +87,7 @@
ThrowXML2(InvalidDatatypeValueException \
, except_code \
, value1 \
- , value2);
+ , value2);
// ---------------------------------------------------------------------------
// Constructors and Destructor
@@ -110,10 +115,10 @@ void AbstractNumericValidator::boundsCheck(const XMLNumber* const theData)
int thisFacetsDefined = getFacetsDefined();
int result;
- try
+ try
{
- // must be < MaxExclusive
+ // must be < MaxExclusive
if ( (thisFacetsDefined & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0 )
{
result = compareValues(theData, getMaxExclusive());
@@ -168,6 +173,8 @@ void AbstractNumericValidator::boundsCheck(const XMLNumber* const theData)
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file AbstractNumericValidator::cpp
*/
diff --git a/src/xercesc/validators/datatype/AbstractNumericValidator.hpp b/src/xercesc/validators/datatype/AbstractNumericValidator.hpp
index 76297aaa3125f7c0d0d20ec84e7baae6d15bc92b..b39d7d476136922b5c37ddaa8dea84a4aa9bdd4a 100644
--- a/src/xercesc/validators/datatype/AbstractNumericValidator.hpp
+++ b/src/xercesc/validators/datatype/AbstractNumericValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:39 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:39 peiyongz
+ * sane_include
*
* Revision 1.2 2001/11/22 20:23:20 peiyongz
* _declspec(dllimport) and inline warning C4273
@@ -75,6 +78,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/XMLNumber.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT AbstractNumericValidator : public AbstractNumericFacetValidator
{
public:
@@ -122,7 +127,10 @@ inline void AbstractNumericValidator::init(RefVectorOf<XMLCh>* const enums)
AbstractNumericFacetValidator::init(enums);
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file AbstractNumericValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/AbstractStringValidator.cpp b/src/xercesc/validators/datatype/AbstractStringValidator.cpp
index fe4b1702ab2187f497e3f79cb1f0dcefcff1ec7e..01e5b11ba0d6a9a943e25aa95d8e4f2733325003 100644
--- a/src/xercesc/validators/datatype/AbstractStringValidator.cpp
+++ b/src/xercesc/validators/datatype/AbstractStringValidator.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
* Revision 1.5 2002/10/02 13:29:12 tng
* Since the compare function return int, so use XMLString::compareString instead of XMLString::equals there.
*
@@ -112,6 +115,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
#include <xercesc/util/NumberFormatException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
static const int BUF_LEN = 64;
static XMLCh value1[BUF_LEN+1];
static XMLCh value2[BUF_LEN+1];
@@ -670,6 +675,8 @@ const RefVectorOf<XMLCh>* AbstractStringValidator::getEnumString() const
return getEnumeration();
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file AbstractStringValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/AbstractStringValidator.hpp b/src/xercesc/validators/datatype/AbstractStringValidator.hpp
index de23440f0e843dc009ba6499b708beaa425bc849..c4d2cba0eb86bf2ed358e8f9611666a46933672c 100644
--- a/src/xercesc/validators/datatype/AbstractStringValidator.hpp
+++ b/src/xercesc/validators/datatype/AbstractStringValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.4 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/10/18 16:52:14 peiyongz
* Patch to Bug#13640: Getter methods not public in
* DecimalDatatypeValidator
@@ -110,6 +113,8 @@
#include <xercesc/validators/datatype/DatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT AbstractStringValidator : public DatatypeValidator
{
public:
@@ -288,7 +293,10 @@ inline void AbstractStringValidator::setEnumeration(RefVectorOf<XMLCh>* enums
}
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file AbstractStringValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.cpp b/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.cpp
index 747183ca0df20be05a33847f1004ad93da60636d..6f1786c18d69d6fab958f617777c7c94d2924d07 100644
--- a/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/14 15:17:31 peiyongz
* getEnumString()
*
@@ -76,6 +79,7 @@
#include <xercesc/validators/schema/SchemaSymbols.hpp>
#include <xercesc/util/RuntimeException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// AnySimpleTypeDatatypeValidator: Constructors and Destructor
@@ -114,6 +118,8 @@ const RefVectorOf<XMLCh>* AnySimpleTypeDatatypeValidator::getEnumString() const
return 0;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file AnySimpleTypeDatatypeValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.hpp b/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.hpp
index 1b188ae397132909572b81eb4b1c92dfe89c6cb0..9f760be19bec02259d315dfbc785d8a5d619cf63 100644
--- a/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.hpp
@@ -63,6 +63,7 @@
#include <xercesc/validators/datatype/DatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class VALIDATORS_EXPORT AnySimpleTypeDatatypeValidator : public DatatypeValidator
{
@@ -191,6 +192,8 @@ AnySimpleTypeDatatypeValidator::validate(const XMLCh* const content)
return;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp b/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp
index dc74393155869e5f8fea9d44bb21e324806520ac..5a76dff2800e4f4d10eca17e82c8e9b4c646337a 100644
--- a/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.10 2001/10/10 14:18:26 peiyongz
* no message
@@ -102,15 +105,17 @@
#include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
//http://www.template.com
//
-static const XMLCh BASE_URI[] =
+static const XMLCh BASE_URI[] =
{
- chLatin_h, chLatin_t, chLatin_t, chLatin_p,
- chColon, chForwardSlash, chForwardSlash,
+ chLatin_h, chLatin_t, chLatin_t, chLatin_p,
+ chColon, chForwardSlash, chForwardSlash,
chLatin_w, chLatin_w, chLatin_w, chPeriod,
- chLatin_t, chLatin_e, chLatin_m, chLatin_p, chLatin_l,
+ chLatin_t, chLatin_e, chLatin_m, chLatin_p, chLatin_l,
chLatin_a, chLatin_t, chLatin_e, chPeriod,
chLatin_c, chLatin_o, chLatin_m, chNull
};
@@ -141,7 +146,7 @@ AnyURIDatatypeValidator::AnyURIDatatypeValidator(
init(enums);
}
catch (...)
- {
+ {
cleanUp();
throw;
}
@@ -182,24 +187,24 @@ int AnyURIDatatypeValidator::getLength(const XMLCh* const content) const
}
void AnyURIDatatypeValidator::checkValueSpace(const XMLCh* const content)
-{
+{
// check 3.2.17.c0 must: URI (rfc 2396/2723)
- try
+ try
{
- if (!fTempURI)
+ if (!fTempURI)
fTempURI = new XMLUri(BASE_URI);
// Support for relative URLs
- // According to Java 1.1: URLs may also be specified with a
+ // According to Java 1.1: URLs may also be specified with a
// String and the URL object that it is related to.
//
- if (XMLString::stringLen(content))
+ if (XMLString::stringLen(content))
{
- XMLUri newURI(fTempURI, content );
+ XMLUri newURI(fTempURI, content );
}
- }
- catch (...)
+ }
+ catch (...)
{
ThrowXML1(InvalidDatatypeValueException
, XMLExcepts::VALUE_URI_Malformed
@@ -208,6 +213,8 @@ void AnyURIDatatypeValidator::checkValueSpace(const XMLCh* const content)
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file AnyURIDatatypeValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp b/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp
index b90cf9cb8871dff1504314e857611e70127df541..40017fef5fb5e65fc10295ef15944ffb488d8519 100644
--- a/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:27 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.8 2001/11/22 20:23:20 peiyongz
* _declspec(dllimport) and inline warning C4273
@@ -96,6 +99,8 @@
#include <xercesc/validators/datatype/AbstractStringValidator.hpp>
#include <xercesc/util/XMLUri.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT AnyURIDatatypeValidator : public AbstractStringValidator
{
public:
@@ -109,8 +114,8 @@ public:
AnyURIDatatypeValidator();
AnyURIDatatypeValidator(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
- , RefVectorOf<XMLCh>* const enums
+ , RefHashTableOf<KVStringPair>* const facets
+ , RefVectorOf<XMLCh>* const enums
, const int finalSet);
virtual ~AnyURIDatatypeValidator();
@@ -150,9 +155,9 @@ private:
// fTempURI
// to support relative URI, such as the urispec= "\sample"
//
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
- XMLUri *fTempURI;
+ XMLUri *fTempURI;
};
@@ -165,7 +170,10 @@ inline void AnyURIDatatypeValidator::cleanUp()
}
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file AnyURIDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.cpp b/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.cpp
index d00c98b02915c0147be8dfb61375ba678ba743ac..8d2519e3c6f6ea16549e8d8a3ef3dfcd9bc43f32 100644
--- a/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 2001, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.12 2001/10/09 20:47:26 peiyongz
* init(): take 1 arg
@@ -106,6 +109,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
#include <xercesc/util/Base64.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -118,7 +123,7 @@ Base64BinaryDatatypeValidator::~Base64BinaryDatatypeValidator()
Base64BinaryDatatypeValidator::Base64BinaryDatatypeValidator(
DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ , RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
:AbstractStringValidator(baseValidator, facets, finalSet, DatatypeValidator::Base64Binary)
@@ -156,7 +161,7 @@ void Base64BinaryDatatypeValidator::checkAdditionalFacet(const XMLCh* const) con
void Base64BinaryDatatypeValidator::checkValueSpace(const XMLCh* const content)
{
- if (getLength(content) <= 0)
+ if (getLength(content) <= 0)
{
ThrowXML1(InvalidDatatypeValueException
, XMLExcepts::VALUE_Not_Base64
@@ -169,6 +174,8 @@ int Base64BinaryDatatypeValidator::getLength(const XMLCh* const content) const
return Base64::getDataLength(content);
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file Base64BinaryDatatypeValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.hpp b/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.hpp
index 7ac39cfb71edd686f70fc39f8001263ee8f7784a..0e8f27ea305000cf6e4c805038fcaf2c3ef41742 100644
--- a/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.6 2001/09/24 15:33:15 peiyongz
* DTV Reorganization: virtual methods moved to *.cpp
@@ -73,6 +76,8 @@
#include <xercesc/validators/datatype/AbstractStringValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT Base64BinaryDatatypeValidator : public AbstractStringValidator
{
public:
@@ -86,8 +91,8 @@ public:
Base64BinaryDatatypeValidator();
Base64BinaryDatatypeValidator(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
- , RefVectorOf<XMLCh>* const enums
+ , RefHashTableOf<KVStringPair>* const facets
+ , RefVectorOf<XMLCh>* const enums
, const int finalSet);
virtual ~Base64BinaryDatatypeValidator();
@@ -123,11 +128,14 @@ private:
// Private data members
//
// Nil
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file Base64BinaryDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/BooleanDatatypeValidator.cpp b/src/xercesc/validators/datatype/BooleanDatatypeValidator.cpp
index 2d309c45842c035e0600725a8af97af44a33b8f7..8528c23eca399392f6ee16de2992ed142263dc0c 100644
--- a/src/xercesc/validators/datatype/BooleanDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/BooleanDatatypeValidator.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -99,6 +102,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
const int ARRAYSIZE = 4;
const XMLCh fgValueSpace[][32] =
{
@@ -238,6 +243,8 @@ const RefVectorOf<XMLCh>* BooleanDatatypeValidator::getEnumString() const
return 0;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file BooleanDatatypeValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/BooleanDatatypeValidator.hpp b/src/xercesc/validators/datatype/BooleanDatatypeValidator.hpp
index d7353ba6da6389ff20f1e0c806a0c8453892d93e..6ec331192959b3946844f4fc4d827f4f4d056b80 100644
--- a/src/xercesc/validators/datatype/BooleanDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/BooleanDatatypeValidator.hpp
@@ -63,6 +63,8 @@
#include <xercesc/validators/datatype/DatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT BooleanDatatypeValidator : public DatatypeValidator
{
public:
@@ -183,7 +185,11 @@ inline void BooleanDatatypeValidator::validate( const XMLCh* const content)
checkContent(content, false);
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file BooleanDatatypeValidator.hpp
*/
-#endif
+
diff --git a/src/xercesc/validators/datatype/DatatypeValidator.cpp b/src/xercesc/validators/datatype/DatatypeValidator.cpp
index d86b3619c14c7aed1eade911b6513a64ee3cb691..d8dcd66028a6f8617ca634785080aba3f73aff12 100644
--- a/src/xercesc/validators/datatype/DatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/DatatypeValidator.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/10/15 18:04:31 knoaman
* Bug [13485]: incorrect return from getWSstring
*
@@ -92,6 +95,8 @@
#include <xercesc/validators/datatype/DatatypeValidator.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// DatatypeValidator: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -125,11 +130,14 @@ const XMLCh* DatatypeValidator::getWSstring(const short theType) const
return SchemaSymbols::fgWS_REPLACE;
case COLLAPSE:
return SchemaSymbols::fgWS_COLLAPSE;
- default:
+ default:
return SchemaSymbols::fgWS_PRESERVE;
}
}
+
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file DatatypeValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/DatatypeValidator.hpp b/src/xercesc/validators/datatype/DatatypeValidator.hpp
index 13e80c1dc8efa9e7b6bbd6bd70678516c7375675..2afbdcba7ddb1577abcbf848411daa9e53a2ff46 100644
--- a/src/xercesc/validators/datatype/DatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/DatatypeValidator.hpp
@@ -65,6 +65,8 @@
#include <xercesc/util/KVStringPair.hpp>
#include <xercesc/util/regx/RegularExpression.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/**
* DataTypeValidator defines the interface that data type validators must
* obey. These validators can be supplied by the application writer and may
@@ -491,6 +493,8 @@ inline bool DatatypeValidator::isAtomic() const {
return true;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp b/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp
index d0b43ad49009570e5d9e2d2fc0d4db5237885084..7179c5384a6f5248003701e54e807aa3e09142eb 100644
--- a/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp
+++ b/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/05/08 12:25:30 tng
* Schema Fix: re-add the ID, IDREF ... datatype validators only if they were not there.
*
@@ -190,6 +193,8 @@
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/XMLRegisterCleanup.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// DatatypeValidatorFactory: Local const data
// ---------------------------------------------------------------------------
@@ -752,6 +757,8 @@ DatatypeValidatorFactory::createDatatypeValidator(const XMLCh* const typeName,
return datatypeValidator;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file DatatypeValidatorFactory.cpp
*/
diff --git a/src/xercesc/validators/datatype/DatatypeValidatorFactory.hpp b/src/xercesc/validators/datatype/DatatypeValidatorFactory.hpp
index 18893edd1ca4043f0dd84705c3cb67f58dff7fb8..ff5e9b52854baf04dd281ccc81655f508782a74e 100644
--- a/src/xercesc/validators/datatype/DatatypeValidatorFactory.hpp
+++ b/src/xercesc/validators/datatype/DatatypeValidatorFactory.hpp
@@ -87,6 +87,8 @@
#include <xercesc/validators/datatype/DatatypeValidator.hpp>
#include <xercesc/util/RefVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// DatatypeValidatorFactory: Local declaration
// ---------------------------------------------------------------------------
@@ -258,6 +260,8 @@ inline void DatatypeValidatorFactory::cleanUp() {
fUserDefinedRegistry = 0;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/datatype/DateDatatypeValidator.cpp b/src/xercesc/validators/datatype/DateDatatypeValidator.cpp
index f0e7aeac5be5848aa60ee8b72e7b495ac32012d8..0f27d8c42c357fabd9454c05dee2637e0c82d4cc 100644
--- a/src/xercesc/validators/datatype/DateDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/DateDatatypeValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/DateDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@ DatatypeValidator* DateDatatypeValidator::newInstance(
//
// caller need to release the date created here
//
-XMLDateTime* DateDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* DateDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -124,6 +129,8 @@ XMLDateTime* DateDatatypeValidator::parse(const XMLCh* const content)
return pRetDate;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file DateDatatypeValidator::cpp
*/
diff --git a/src/xercesc/validators/datatype/DateDatatypeValidator.hpp b/src/xercesc/validators/datatype/DateDatatypeValidator.hpp
index af836ea7e6c7ccd04644634aa592174e6fbf2a77..e9180ee7724e8dd9fc5b2628fe92380f06356e84 100644
--- a/src/xercesc/validators/datatype/DateDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/DateDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -70,6 +73,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT DateDatatypeValidator : public DateTimeValidator
{
public:
@@ -108,8 +113,11 @@ protected:
virtual XMLDateTime* parse(const XMLCh* const);
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file DateDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/DateTimeDatatypeValidator.cpp b/src/xercesc/validators/datatype/DateTimeDatatypeValidator.cpp
index d952d425a8ccff0db78646adb3ec56e3dc86411b..174e977bdb9aea8d16a0af1575c14ae1bc31d8ee 100644
--- a/src/xercesc/validators/datatype/DateTimeDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/DateTimeDatatypeValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/DateTimeDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@ DatatypeValidator* DateTimeDatatypeValidator::newInstance(
//
// caller need to release the date created here
//
-XMLDateTime* DateTimeDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* DateTimeDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -124,6 +129,8 @@ XMLDateTime* DateTimeDatatypeValidator::parse(const XMLCh* const content)
return pRetDate;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file DateTimeDatatypeValidator::cpp
*/
diff --git a/src/xercesc/validators/datatype/DateTimeDatatypeValidator.hpp b/src/xercesc/validators/datatype/DateTimeDatatypeValidator.hpp
index fe3fbf1d021acd2489676def1c4b0a611f380b5b..913172b4c07e9d684df0c62c14cfa503886c1b48 100644
--- a/src/xercesc/validators/datatype/DateTimeDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/DateTimeDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -70,6 +73,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT DateTimeDatatypeValidator : public DateTimeValidator
{
public:
@@ -108,8 +113,11 @@ protected:
virtual XMLDateTime* parse(const XMLCh* const);
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file DateTimeDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/DateTimeValidator.cpp b/src/xercesc/validators/datatype/DateTimeValidator.cpp
index 9075c4677ebc836fda466a7c1a849641729a2cef..d134efe315a8ff82a91b5e748f85284c180ed60e 100644
--- a/src/xercesc/validators/datatype/DateTimeValidator.cpp
+++ b/src/xercesc/validators/datatype/DateTimeValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.2 2001/11/12 20:37:57 peiyongz
* SchemaDateTimeException defined
@@ -76,6 +79,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
static const int BUF_LEN = 64;
static XMLCh value1[BUF_LEN+1];
static XMLCh value2[BUF_LEN+1];
@@ -91,7 +96,7 @@ static XMLCh value2[BUF_LEN+1];
ThrowXML2(InvalidDatatypeValueException \
, except_code \
, value1 \
- , value2);
+ , value2);
// ---------------------------------------------------------------------------
// Constructors and Destructor
@@ -118,7 +123,7 @@ int DateTimeValidator::compare(const XMLCh* const value1
, const XMLCh* const value2)
{
try
- {
+ {
XMLDateTime *pDate1 = parse(value1);
Janitor<XMLDateTime> jName1(pDate1);
XMLDateTime *pDate2 = parse(value2);
@@ -126,9 +131,9 @@ int DateTimeValidator::compare(const XMLCh* const value1
int result = compareDates(pDate1, pDate2, true);
return (result==INDETERMINATE)? -1 : result;
}
- catch (...) // RuntimeException e
+ catch (...) // RuntimeException e
{
- return -1; // revisit after implement compareDates()
+ return -1; // revisit after implement compareDates()
}
}
@@ -189,7 +194,7 @@ void DateTimeValidator::checkContent(const XMLCh* const content
if (asBase)
return;
- try
+ try
{
// the derived classes' parse() method constructs an
// XMLDateTime object anc invokes appropriate XMLDateTime's
@@ -199,7 +204,7 @@ void DateTimeValidator::checkContent(const XMLCh* const content
int result;
- // must be < MaxExclusive
+ // must be < MaxExclusive
if ( (thisFacetsDefined & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0 )
{
result = compareValues(theDate, getMaxExclusive());
@@ -215,12 +220,12 @@ void DateTimeValidator::checkContent(const XMLCh* const content
if ( (thisFacetsDefined & DatatypeValidator::FACET_MAXINCLUSIVE) != 0 )
{
result = compareValues(theDate, getMaxInclusive());
- if ( result == XMLDateTime::GREATER_THAN || result == XMLDateTime::INDETERMINATE )
+ if ( result == XMLDateTime::GREATER_THAN || result == XMLDateTime::INDETERMINATE )
{
REPORT_VALUE_ERROR(theDate
, getMaxInclusive()
, XMLExcepts::VALUE_exceed_maxIncl)
- }
+ }
}
// must be >= MinInclusive
@@ -262,7 +267,7 @@ void DateTimeValidator::checkContent(const XMLCh* const content
ThrowXML1(InvalidDatatypeValueException, XMLExcepts::VALUE_NotIn_Enumeration, content);
}
}
- catch (...)
+ catch (...)
{
ThrowXML1(InvalidDatatypeValueException, XMLExcepts::VALUE_NotIn_Enumeration, content);
// new error message needed here
@@ -283,7 +288,7 @@ int DateTimeValidator::compareValues(const XMLNumber* const lValue
/**
* Compare algorithm described in dateDime (3.2.7).
* Duration datatype overwrites this method
- *
+ *
* @param date1 normalized date representation of the first value
* @param date2 normalized date representation of the second value
* @param strict
@@ -335,7 +340,7 @@ void DateTimeValidator::setMinExclusive(const XMLCh* const value)
void DateTimeValidator::setEnumeration()
{
// to do: do we need to check against base value space???
-
+
if (!fStrEnumeration)
return;
@@ -348,6 +353,8 @@ void DateTimeValidator::setEnumeration()
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file DateTimeValidator::cpp
*/
diff --git a/src/xercesc/validators/datatype/DateTimeValidator.hpp b/src/xercesc/validators/datatype/DateTimeValidator.hpp
index f25d3faa39194211ea7b7c05b3093ffd28eecc33..27c55792c87d0deeff7d6d98a8a05e0d2121b039 100644
--- a/src/xercesc/validators/datatype/DateTimeValidator.hpp
+++ b/src/xercesc/validators/datatype/DateTimeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.2 2001/11/12 20:37:57 peiyongz
* SchemaDateTimeException defined
@@ -74,6 +77,8 @@
#include <xercesc/validators/datatype/AbstractNumericFacetValidator.hpp>
#include <xercesc/util/XMLDateTime.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT DateTimeValidator : public AbstractNumericFacetValidator
{
public:
@@ -136,7 +141,7 @@ protected:
protected:
// -----------------------------------------------------------------------
- // helper interface: to be implemented/overwritten by derived class
+ // helper interface: to be implemented/overwritten by derived class
// -----------------------------------------------------------------------
virtual XMLDateTime* parse(const XMLCh* const) = 0;
@@ -147,9 +152,12 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file DateTimeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/DayDatatypeValidator.cpp b/src/xercesc/validators/datatype/DayDatatypeValidator.cpp
index 51f6d156803ba5c1c7e323a4a1266b62c3953522..320e08e34ec1001d5f7ebf22bcc7ec251671932a 100644
--- a/src/xercesc/validators/datatype/DayDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/DayDatatypeValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/DayDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@ DatatypeValidator* DayDatatypeValidator::newInstance(
//
// caller need to release the date created here
//
-XMLDateTime* DayDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* DayDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -124,6 +129,8 @@ XMLDateTime* DayDatatypeValidator::parse(const XMLCh* const content)
return pRetDate;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file DayDatatypeValidator::cpp
*/
diff --git a/src/xercesc/validators/datatype/DayDatatypeValidator.hpp b/src/xercesc/validators/datatype/DayDatatypeValidator.hpp
index 8e51fd79bf853ffeb9c67b78c1bd035d9d779de1..42b7ab02552612e263761b0f5c5762ba9458b8aa 100644
--- a/src/xercesc/validators/datatype/DayDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/DayDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -70,6 +73,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT DayDatatypeValidator : public DateTimeValidator
{
public:
@@ -107,8 +112,11 @@ protected:
virtual XMLDateTime* parse(const XMLCh* const);
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file DayDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp b/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp
index 1c3bb832d9969aa1b176d3e9c749e09f82a623ae..aaef6fd4d25f27cc55bf285e66b0032c482afb3c 100644
--- a/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -131,6 +134,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
#include <xercesc/util/NumberFormatException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
static const int BUF_LEN = 64;
static XMLCh value1[BUF_LEN+1];
static XMLCh value2[BUF_LEN+1];
@@ -550,6 +555,8 @@ void DecimalDatatypeValidator::checkContent( const XMLCh* const content, bool as
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file DecimalDatatypeValidator::cpp
*/
diff --git a/src/xercesc/validators/datatype/DecimalDatatypeValidator.hpp b/src/xercesc/validators/datatype/DecimalDatatypeValidator.hpp
index 01e3f78d0125d8f5fe5f82d7d48c1f58f6f4984c..5c114c9d68ce1b8a141aa4f84c388fadce9e228e 100644
--- a/src/xercesc/validators/datatype/DecimalDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/DecimalDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/10/17 20:49:05 peiyongz
* Patch to Bug#13640: Getter methods not public in DecimalDatatypeValidator
*
@@ -84,6 +87,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/XMLBigDecimal.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT DecimalDatatypeValidator : public AbstractNumericValidator
{
public:
@@ -143,7 +148,7 @@ protected:
// -----------------------------------------------------------------------
// Abstract interface from AbstractNumericFacetValidator
// -----------------------------------------------------------------------
-
+
virtual void assignAdditionalFacet(const XMLCh* const key
, const XMLCh* const value);
@@ -228,7 +233,10 @@ inline void DecimalDatatypeValidator::setFractionDigits(unsigned int newFraction
fFractionDigits = newFractionDigits;
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file DecimalDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/DoubleDatatypeValidator.cpp b/src/xercesc/validators/datatype/DoubleDatatypeValidator.cpp
index 43c5b1f4cd32dba5898140350b8326d809b95364..c137cd7a6a4ac9061878287998e2d8c0103b7b38 100644
--- a/src/xercesc/validators/datatype/DoubleDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/DoubleDatatypeValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.6 2001/10/02 18:59:29 peiyongz
* Invalid_Facet_Tag to display the tag name
@@ -89,6 +92,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -208,7 +213,7 @@ void DoubleDatatypeValidator::setEnumeration()
{
numBase->checkContent(fStrEnumeration->elementAt(i), false);
}
- }
+ }
catch (XMLException&)
{
ThrowXML1(InvalidDatatypeFacetException
@@ -220,11 +225,11 @@ void DoubleDatatypeValidator::setEnumeration()
// We put the this->checkContent in a separate loop
// to not block original message with in that method.
- //
+ //
for ( i = 0; i < enumLength; i++)
{
checkContent(fStrEnumeration->elementAt(i), false);
- }
+ }
fEnumeration = new RefVectorOf<XMLNumber>(enumLength, true);
fEnumerationInherited = false;
@@ -232,7 +237,7 @@ void DoubleDatatypeValidator::setEnumeration()
for ( i = 0; i < enumLength; i++)
{
fEnumeration->insertElementAt(new XMLDouble(fStrEnumeration->elementAt(i)), i);
- }
+ }
}
// -----------------------------------------------------------------------
@@ -303,6 +308,8 @@ void DoubleDatatypeValidator::checkContent( const XMLCh* const content, bool asB
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file DoubleDatatypeValidator::cpp
*/
diff --git a/src/xercesc/validators/datatype/DoubleDatatypeValidator.hpp b/src/xercesc/validators/datatype/DoubleDatatypeValidator.hpp
index e0fe9f0704c37cbb996c6679f2cef685b62efc14..55187bb06ddfe3d57c9846e8034470e1f4607f1d 100644
--- a/src/xercesc/validators/datatype/DoubleDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/DoubleDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.5 2001/10/09 20:52:43 peiyongz
* init():removed
@@ -86,6 +89,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/XMLDouble.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT DoubleDatatypeValidator : public AbstractNumericValidator
{
public:
@@ -145,7 +150,7 @@ protected:
// -----------------------------------------------------------------------
// Abstract interface from AbstractNumericFacetValidator
// -----------------------------------------------------------------------
-
+
virtual void assignAdditionalFacet(const XMLCh* const key
, const XMLCh* const value);
@@ -176,7 +181,10 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file DoubleDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/DurationDatatypeValidator.cpp b/src/xercesc/validators/datatype/DurationDatatypeValidator.cpp
index 91a3859869714929255dcb24083c24c88b41a625..43b3b5d75ca06401dc82aa61fc132d1a137709d2 100644
--- a/src/xercesc/validators/datatype/DurationDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/DurationDatatypeValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/DurationDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@ DatatypeValidator* DurationDatatypeValidator::newInstance(
//
// caller need to release the date created here
//
-XMLDateTime* DurationDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* DurationDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -131,6 +136,8 @@ int DurationDatatypeValidator::compareDates(const XMLDateTime* const date1
return XMLDateTime::compare(date1, date2, strict);
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file DurationDatatypeValidator::cpp
*/
diff --git a/src/xercesc/validators/datatype/DurationDatatypeValidator.hpp b/src/xercesc/validators/datatype/DurationDatatypeValidator.hpp
index 462cd732b592556fb420864472281d9fcef2ed86..39bdb3bb039a4c5c0f4109662a03530460658133 100644
--- a/src/xercesc/validators/datatype/DurationDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/DurationDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -70,6 +73,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT DurationDatatypeValidator : public DateTimeValidator
{
public:
@@ -107,14 +112,17 @@ protected:
// -----------------------------------------------------------------------
virtual XMLDateTime* parse(const XMLCh* const);
- virtual int compareDates(const XMLDateTime* const
+ virtual int compareDates(const XMLDateTime* const
, const XMLDateTime* const
, bool );
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file DurationDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/ENTITYDatatypeValidator.cpp b/src/xercesc/validators/datatype/ENTITYDatatypeValidator.cpp
index d94c4d4854740d41cdfa5953dd3fe35c14217c71..7cbddd5b19e7985d69f1b744ada2fbfce4af7ed3 100644
--- a/src/xercesc/validators/datatype/ENTITYDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/ENTITYDatatypeValidator.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -93,6 +96,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
#include <xercesc/framework/XMLEntityDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -174,6 +179,8 @@ void ENTITYDatatypeValidator::checkValueSpace(const XMLCh* const content)
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file ENTITYDatatypeValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/ENTITYDatatypeValidator.hpp b/src/xercesc/validators/datatype/ENTITYDatatypeValidator.hpp
index 808b497713a21dba1c3ca97753fd236071551ee6..150f15540fa8dc1280cf107350ca5b9548230c1f 100644
--- a/src/xercesc/validators/datatype/ENTITYDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/ENTITYDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.7 2001/11/22 20:23:20 peiyongz
* _declspec(dllimport) and inline warning C4273
@@ -90,6 +93,8 @@
#include <xercesc/validators/datatype/StringDatatypeValidator.hpp>
#include <xercesc/internal/XMLScanner.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT ENTITYDatatypeValidator : public StringDatatypeValidator
{
public:
@@ -197,7 +202,10 @@ inline void ENTITYDatatypeValidator::setEntityDeclPool(NameIdPool<DTDEntityDecl>
fEntityDeclPool = entityDeclPool;
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file ENTITYDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/FloatDatatypeValidator.cpp b/src/xercesc/validators/datatype/FloatDatatypeValidator.cpp
index 56f4be2bc159032541e2a3061074c1dc67a43217..8c6109613f75d2fd7d892f674c799829d3970da9 100644
--- a/src/xercesc/validators/datatype/FloatDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/FloatDatatypeValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.6 2001/10/02 18:59:29 peiyongz
* Invalid_Facet_Tag to display the tag name
@@ -90,6 +93,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -209,7 +214,7 @@ void FloatDatatypeValidator::setEnumeration()
{
numBase->checkContent(fStrEnumeration->elementAt(i), false);
}
- }
+ }
catch (XMLException&)
{
ThrowXML1(InvalidDatatypeFacetException
@@ -221,11 +226,11 @@ void FloatDatatypeValidator::setEnumeration()
// We put the this->checkContent in a separate loop
// to not block original message with in that method.
- //
+ //
for ( i = 0; i < enumLength; i++)
{
checkContent(fStrEnumeration->elementAt(i), false);
- }
+ }
fEnumeration = new RefVectorOf<XMLNumber>(enumLength, true);
fEnumerationInherited = false;
@@ -233,7 +238,7 @@ void FloatDatatypeValidator::setEnumeration()
for ( i = 0; i < enumLength; i++)
{
fEnumeration->insertElementAt(new XMLFloat(fStrEnumeration->elementAt(i)), i);
- }
+ }
}
// -----------------------------------------------------------------------
@@ -302,6 +307,8 @@ void FloatDatatypeValidator::checkContent( const XMLCh* const content, bool asBa
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file FloatDatatypeValidator::cpp
*/
diff --git a/src/xercesc/validators/datatype/FloatDatatypeValidator.hpp b/src/xercesc/validators/datatype/FloatDatatypeValidator.hpp
index 8d0aa63dfbe5e8dd5d68e29c77444d3082b9359e..0f58aa51ef65b84220cde1eb62f39f990e68cd0d 100644
--- a/src/xercesc/validators/datatype/FloatDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/FloatDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.5 2001/10/09 20:52:43 peiyongz
* init():removed
@@ -87,6 +90,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/XMLFloat.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT FloatDatatypeValidator : public AbstractNumericValidator
{
public:
@@ -146,7 +151,7 @@ protected:
// -----------------------------------------------------------------------
// Abstract interface from AbstractNumericFacetValidator
// -----------------------------------------------------------------------
-
+
virtual void assignAdditionalFacet(const XMLCh* const key
, const XMLCh* const value);
@@ -177,7 +182,10 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file FloatDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.cpp b/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.cpp
index 690215c42b57bdcbb23b31ec7920a0c18d5b93d1..4a84544a31f9faf0fe45e577c73484c4cd05b440 100644
--- a/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 2001, International
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.12 2001/10/09 20:47:45 peiyongz
* init(): take 1 arg
@@ -106,6 +109,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
#include <xercesc/util/HexBin.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -118,8 +123,8 @@ HexBinaryDatatypeValidator::~HexBinaryDatatypeValidator()
HexBinaryDatatypeValidator::HexBinaryDatatypeValidator(
DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
- , RefVectorOf<XMLCh>* const enums
+ , RefHashTableOf<KVStringPair>* const facets
+ , RefVectorOf<XMLCh>* const enums
, const int finalSet)
:AbstractStringValidator(baseValidator, facets, finalSet, DatatypeValidator::HexBinary)
{
@@ -156,7 +161,7 @@ void HexBinaryDatatypeValidator::checkAdditionalFacet(const XMLCh* const) const
void HexBinaryDatatypeValidator::checkValueSpace(const XMLCh* const content)
{
- if (getLength(content) <= 0)
+ if (getLength(content) <= 0)
{
ThrowXML1(InvalidDatatypeValueException
, XMLExcepts::VALUE_Not_HexBin
@@ -169,6 +174,8 @@ int HexBinaryDatatypeValidator::getLength(const XMLCh* const content) const
return HexBin::getDataLength(content);
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file HexBinaryDatatypeValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.hpp b/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.hpp
index e90a7d095b7589b8ac225dcb361f9147ba7d5fd5..e005fbbe281cb9cc7cdb3b9978e7a36777be0a4d 100644
--- a/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 2001, International
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.6 2001/09/24 15:33:15 peiyongz
* DTV Reorganization: virtual methods moved to *.cpp
@@ -73,6 +76,8 @@
#include <xercesc/validators/datatype/AbstractStringValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT HexBinaryDatatypeValidator : public AbstractStringValidator
{
public:
@@ -86,8 +91,8 @@ public:
HexBinaryDatatypeValidator();
HexBinaryDatatypeValidator(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
- , RefVectorOf<XMLCh>* const enums
+ , RefHashTableOf<KVStringPair>* const facets
+ , RefVectorOf<XMLCh>* const enums
, const int finalSet);
virtual ~HexBinaryDatatypeValidator();
@@ -124,10 +129,13 @@ private:
// Private data members
//
// Nil.
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file HexBinaryDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/IDDatatypeValidator.cpp b/src/xercesc/validators/datatype/IDDatatypeValidator.cpp
index b6cab64bf82c2f41fe02d6f73ebb22534684b915..c6dde9ead1faa1fd87ca5a76ca166e73593eb78d 100644
--- a/src/xercesc/validators/datatype/IDDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/IDDatatypeValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.6 2001/10/09 20:50:02 peiyongz
* init(): take 1 arg
@@ -88,6 +91,8 @@
#include <xercesc/validators/datatype/IDDatatypeValidator.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -180,6 +185,8 @@ void IDDatatypeValidator::checkValueSpace(const XMLCh* const content)
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file IDDatatypeValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/IDDatatypeValidator.hpp b/src/xercesc/validators/datatype/IDDatatypeValidator.hpp
index d598bd24f6b2b994b5a0f1079b16d4d438136855..e013af4693645b0adee9724ccc5bc657ce301c74 100644
--- a/src/xercesc/validators/datatype/IDDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/IDDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.8 2001/11/22 20:23:20 peiyongz
* _declspec(dllimport) and inline warning C4273
@@ -96,6 +99,8 @@
#include <xercesc/validators/schema/SchemaSymbols.hpp>
#include <xercesc/framework/XMLRefInfo.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT IDDatatypeValidator : public StringDatatypeValidator
{
public:
@@ -176,7 +181,10 @@ inline void IDDatatypeValidator::setIDRefList(RefHashTableOf<XMLRefInfo>* newIDR
fIDRefList = newIDRefList;
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
/**
* End of file IDDatatypeValidator.hpp
*/
-#endif
+
diff --git a/src/xercesc/validators/datatype/IDREFDatatypeValidator.cpp b/src/xercesc/validators/datatype/IDREFDatatypeValidator.cpp
index 51e4d7d2baf4d51befed43c9a21cbf9b9f315a42..b9b4838bee428a27c660d28bd0d9e4fee7c3269e 100644
--- a/src/xercesc/validators/datatype/IDREFDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/IDREFDatatypeValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.6 2001/10/09 20:49:38 peiyongz
* init(): take 1 arg
@@ -86,6 +89,8 @@
#include <xercesc/validators/datatype/IDREFDatatypeValidator.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -174,6 +179,8 @@ void IDREFDatatypeValidator::checkValueSpace(const XMLCh* const content)
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file IDREFDatatypeValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/IDREFDatatypeValidator.hpp b/src/xercesc/validators/datatype/IDREFDatatypeValidator.hpp
index ee3e7096601d2966a8c431fb11fcce9f828ad27d..18addb41ff093f0e52fc874cb047fadf4767fa0a 100644
--- a/src/xercesc/validators/datatype/IDREFDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/IDREFDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:41 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:41 peiyongz
+ * sane_include
*
* Revision 1.8 2001/11/22 20:23:20 peiyongz
* _declspec(dllimport) and inline warning C4273
@@ -93,6 +96,8 @@
#include <xercesc/validators/datatype/StringDatatypeValidator.hpp>
#include <xercesc/framework/XMLRefInfo.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT IDREFDatatypeValidator : public StringDatatypeValidator
{
public:
@@ -177,7 +182,10 @@ inline void IDREFDatatypeValidator::setIDRefList(RefHashTableOf<XMLRefInfo>* new
fIDRefList = newIDRefList;
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file IDREFDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/InvalidDatatypeFacetException.hpp b/src/xercesc/validators/datatype/InvalidDatatypeFacetException.hpp
index c568e82a9971b686e971a4e94294ca921de54e98..e18973afe7a88e5f7201adbbb9e4e4b8243e5251 100644
--- a/src/xercesc/validators/datatype/InvalidDatatypeFacetException.hpp
+++ b/src/xercesc/validators/datatype/InvalidDatatypeFacetException.hpp
@@ -65,7 +65,10 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
MakeXMLException(InvalidDatatypeFacetException, XMLUTIL_EXPORT)
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/datatype/InvalidDatatypeValueException.hpp b/src/xercesc/validators/datatype/InvalidDatatypeValueException.hpp
index d2a908214923a109f815279c51cb29b337481857..fe6f5a51247ab99e25ddce1550db98113905b16f 100644
--- a/src/xercesc/validators/datatype/InvalidDatatypeValueException.hpp
+++ b/src/xercesc/validators/datatype/InvalidDatatypeValueException.hpp
@@ -65,7 +65,10 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
MakeXMLException(InvalidDatatypeValueException, XMLUTIL_EXPORT)
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/datatype/ListDatatypeValidator.cpp b/src/xercesc/validators/datatype/ListDatatypeValidator.cpp
index 9bba0b411ff58f4dbec2db52de3c4265cd0e65fb..ea0018af7a0a83a44ae971526d2b55048b679da7 100644
--- a/src/xercesc/validators/datatype/ListDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/ListDatatypeValidator.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -100,6 +103,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
#include <xercesc/util/NumberFormatException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
static const int BUF_LEN = 64;
static XMLCh value1[BUF_LEN+1];
static XMLCh value2[BUF_LEN+1];
@@ -447,6 +452,8 @@ void ListDatatypeValidator::inheritFacet()
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file ListDatatypeValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/ListDatatypeValidator.hpp b/src/xercesc/validators/datatype/ListDatatypeValidator.hpp
index ed51d60035f6dd2091c260536e27f341e52f0690..10bc793f2c912509e6aa392b2072598213af62cf 100644
--- a/src/xercesc/validators/datatype/ListDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/ListDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.11 2001/11/22 20:23:20 peiyongz
* _declspec(dllimport) and inline warning C4273
@@ -101,6 +104,8 @@
#include <xercesc/validators/datatype/AbstractStringValidator.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT ListDatatypeValidator : public AbstractStringValidator
{
public:
@@ -194,8 +199,8 @@ protected:
virtual int getLength(const XMLCh* const content) const;
- //
- // Overwrite AbstractStringValidator's
+ //
+ // Overwrite AbstractStringValidator's
//
virtual void inspectFacetBase();
@@ -249,7 +254,10 @@ inline void ListDatatypeValidator::setContent(const XMLCh* const content)
fContent = content;
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file ListDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/MonthDatatypeValidator.cpp b/src/xercesc/validators/datatype/MonthDatatypeValidator.cpp
index 545eaad12980d20a529f0e576d0f978de14bf758..d1275bcf2d4147ce725249aa8743f5faef5e1527 100644
--- a/src/xercesc/validators/datatype/MonthDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/MonthDatatypeValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/MonthDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@ DatatypeValidator* MonthDatatypeValidator::newInstance(
//
// caller need to release the date created here
//
-XMLDateTime* MonthDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* MonthDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -124,6 +129,8 @@ XMLDateTime* MonthDatatypeValidator::parse(const XMLCh* const content)
return pRetDate;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file MonthDatatypeValidator::cpp
*/
diff --git a/src/xercesc/validators/datatype/MonthDatatypeValidator.hpp b/src/xercesc/validators/datatype/MonthDatatypeValidator.hpp
index 04fdd808fac06de2bab62a9788fe791a840216ec..1f719b7f791e692d3e4c3dfe4c46aba6ca5b8b6e 100644
--- a/src/xercesc/validators/datatype/MonthDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/MonthDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -70,6 +73,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT MonthDatatypeValidator : public DateTimeValidator
{
public:
@@ -108,8 +113,11 @@ protected:
virtual XMLDateTime* parse(const XMLCh* const);
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file MonthDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/MonthDayDatatypeValidator.cpp b/src/xercesc/validators/datatype/MonthDayDatatypeValidator.cpp
index affe2502051a1eb9d1da0c57951efa7ac0b2f48c..21fd9c7624e340eff38a72e1e5373a1c267a9613 100644
--- a/src/xercesc/validators/datatype/MonthDayDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/MonthDayDatatypeValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/MonthDayDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@ DatatypeValidator* MonthDayDatatypeValidator::newInstance(
//
// caller need to release the date created here
//
-XMLDateTime* MonthDayDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* MonthDayDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -124,6 +129,8 @@ XMLDateTime* MonthDayDatatypeValidator::parse(const XMLCh* const content)
return pRetDate;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file MonthDayDatatypeValidator::cpp
*/
diff --git a/src/xercesc/validators/datatype/MonthDayDatatypeValidator.hpp b/src/xercesc/validators/datatype/MonthDayDatatypeValidator.hpp
index 9bcaf8f69bbf574d21969d7d229129f80df74be5..cde8fe194bc9b40e4103b572f0170c1b35173180 100644
--- a/src/xercesc/validators/datatype/MonthDayDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/MonthDayDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -70,6 +73,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT MonthDayDatatypeValidator : public DateTimeValidator
{
public:
@@ -108,8 +113,11 @@ protected:
virtual XMLDateTime* parse(const XMLCh* const);
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file MonthDayDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/NCNameDatatypeValidator.cpp b/src/xercesc/validators/datatype/NCNameDatatypeValidator.cpp
index d1e370737b295ae982b56269c72c01085f670f1d..b2064e851fcbd4e5844e305ed3a7ee42271bc968 100644
--- a/src/xercesc/validators/datatype/NCNameDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/NCNameDatatypeValidator.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -80,6 +83,8 @@
#include <xercesc/validators/datatype/NCNameDatatypeValidator.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -152,6 +157,8 @@ void NCNameDatatypeValidator::checkValueSpace(const XMLCh* const content)
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file NCNameDatatypeValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/NCNameDatatypeValidator.hpp b/src/xercesc/validators/datatype/NCNameDatatypeValidator.hpp
index 44e2f14a5f4cff190e235b6fb9d1c8c5f133dfda..e43da32dc020efc50e3cb7baa14f5ec023c2c879 100644
--- a/src/xercesc/validators/datatype/NCNameDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/NCNameDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.3 2001/10/09 20:49:09 peiyongz
* init(): take 1 arg
@@ -76,6 +79,8 @@
#include <xercesc/validators/datatype/StringDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT NCNameDatatypeValidator : public StringDatatypeValidator
{
public:
@@ -162,7 +167,11 @@ private:
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file NCNameDatatypeValidator.hpp
*/
-#endif
+
diff --git a/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.cpp b/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.cpp
index 4b68f1fb464a8fd7164b902031ea7f016bf0e80b..1937960c503b53384922fb39305cefdd2445bc87 100644
--- a/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 2001, International
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.10 2001/10/10 15:11:21 peiyongz
* extract/validate URI iff present
@@ -98,6 +101,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -110,7 +115,7 @@ NOTATIONDatatypeValidator::~NOTATIONDatatypeValidator()
NOTATIONDatatypeValidator::NOTATIONDatatypeValidator(
DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ , RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
:AbstractStringValidator(baseValidator, facets, finalSet, DatatypeValidator::NOTATION)
@@ -169,12 +174,12 @@ void NOTATIONDatatypeValidator::checkValueSpace(const XMLCh* const content)
ArrayJanitor<XMLCh> jan1(uriPart);
XMLString::subString(uriPart, content, 0, colonPosition);
- try
+ try
{
// no relative uri support here
- XMLUri newURI(uriPart);
+ XMLUri newURI(uriPart);
}
- catch (...)
+ catch (...)
{
ThrowXML1(InvalidDatatypeValueException
, XMLExcepts::VALUE_NOTATION_Invalid
@@ -201,6 +206,8 @@ int NOTATIONDatatypeValidator::getLength(const XMLCh* const content) const
return XMLString::stringLen(content);
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file NOTATIONDatatypeValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.hpp b/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.hpp
index 5af95df22428f28db4c8b50e6fe46078c146a227..4233d3bc7b8ec90b9c491fecfb2389a7bfe1bf96 100644
--- a/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.5 2001/09/24 15:33:15 peiyongz
* DTV Reorganization: virtual methods moved to *.cpp
@@ -84,6 +87,8 @@
#include <xercesc/validators/datatype/AbstractStringValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT NOTATIONDatatypeValidator : public AbstractStringValidator
{
public:
@@ -97,8 +102,8 @@ public:
NOTATIONDatatypeValidator();
NOTATIONDatatypeValidator(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
- , RefVectorOf<XMLCh>* const enums
+ , RefHashTableOf<KVStringPair>* const facets
+ , RefVectorOf<XMLCh>* const enums
, const int finalSet);
virtual ~NOTATIONDatatypeValidator();
@@ -134,11 +139,14 @@ private:
// Private data members
//
// Nil
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
/**
* End of file NOTATIONDatatypeValidator.hpp
*/
-#endif
+
diff --git a/src/xercesc/validators/datatype/NameDatatypeValidator.cpp b/src/xercesc/validators/datatype/NameDatatypeValidator.cpp
index 109e748d60a943a20f1d866df69216093cbab88d..4e3613f8f09961b6c0d6db7488fdd8e1c084644a 100644
--- a/src/xercesc/validators/datatype/NameDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/NameDatatypeValidator.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -83,6 +86,8 @@
#include <xercesc/validators/datatype/NameDatatypeValidator.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -154,6 +159,8 @@ void NameDatatypeValidator::checkValueSpace(const XMLCh* const content)
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file NameDatatypeValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/NameDatatypeValidator.hpp b/src/xercesc/validators/datatype/NameDatatypeValidator.hpp
index bd3bd6e2de720a2b1f22c2681d7be401eb576c46..32a80bdce080432af12b0a0202b9cc39f1f6ccfb 100644
--- a/src/xercesc/validators/datatype/NameDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/NameDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.3 2001/10/09 20:48:39 peiyongz
* init(): take 1 arg
@@ -76,6 +79,8 @@
#include <xercesc/validators/datatype/StringDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT NameDatatypeValidator : public StringDatatypeValidator
{
public:
@@ -162,7 +167,11 @@ private:
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file NameDatatypeValidator.hpp
*/
-#endif
+
diff --git a/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp b/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp
index 46a0a72d76f2b96715d384f72adc0ea176e7c29b..e975e5ebeb6f7329f46c3e2a8104e0c91330f669 100644
--- a/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.9 2001/10/09 20:47:05 peiyongz
* init(): take 1 arg
@@ -94,6 +97,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -159,7 +164,9 @@ int QNameDatatypeValidator::getLength(const XMLCh* const content) const
{
return XMLString::stringLen(content);
}
-
+
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file QNameDatatypeValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/QNameDatatypeValidator.hpp b/src/xercesc/validators/datatype/QNameDatatypeValidator.hpp
index 623b461eaa911aa8266f85ea618536809a191907..7a1270139c326be2defb503acb53cd51f751a101 100644
--- a/src/xercesc/validators/datatype/QNameDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/QNameDatatypeValidator.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.5 2001/09/24 15:33:15 peiyongz
* DTV Reorganization: virtual methods moved to *.cpp
@@ -84,6 +87,8 @@
#include <xercesc/validators/datatype/AbstractStringValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT QNameDatatypeValidator : public AbstractStringValidator
{
public:
@@ -97,8 +102,8 @@ public:
QNameDatatypeValidator();
QNameDatatypeValidator(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
- , RefVectorOf<XMLCh>* const enums
+ , RefHashTableOf<KVStringPair>* const facets
+ , RefVectorOf<XMLCh>* const enums
, const int finalSet);
virtual ~QNameDatatypeValidator();
@@ -133,12 +138,15 @@ private:
// Private data members
//
// Nil
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file QNameDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/StringDatatypeValidator.cpp b/src/xercesc/validators/datatype/StringDatatypeValidator.cpp
index fb0c5bed23f91031b1a088114c88ee750bc87a36..931a64a67d328244837e032008d7f5fdd3cfd20d 100644
--- a/src/xercesc/validators/datatype/StringDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/StringDatatypeValidator.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -121,6 +124,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp>
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
static const int BUF_LEN = 64;
static XMLCh value1[BUF_LEN+1];
static XMLCh value2[BUF_LEN+1];
@@ -281,6 +286,8 @@ int StringDatatypeValidator::getLength(const XMLCh* const content) const
return XMLString::stringLen(content);
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file StringDatatypeValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/StringDatatypeValidator.hpp b/src/xercesc/validators/datatype/StringDatatypeValidator.hpp
index d93971b92bd7ef8f116856d357e0ccba9b71c56d..037aa95b73931cd772858405750807bf083331df 100644
--- a/src/xercesc/validators/datatype/StringDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/StringDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.10 2001/11/22 20:23:20 peiyongz
* _declspec(dllimport) and inline warning C4273
@@ -82,6 +85,8 @@
#include <xercesc/validators/datatype/AbstractStringValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT StringDatatypeValidator : public AbstractStringValidator
{
public:
@@ -164,7 +169,10 @@ inline void StringDatatypeValidator::setWhiteSpace(short newValue)
fWhiteSpace = newValue;
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file StringDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/TimeDatatypeValidator.cpp b/src/xercesc/validators/datatype/TimeDatatypeValidator.cpp
index eb2a1e3255d2f0a580d61553188761ec0eb4d768..ceb2a939b377e8389cd1f8a995896ce84b43e00e 100644
--- a/src/xercesc/validators/datatype/TimeDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/TimeDatatypeValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/TimeDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@ DatatypeValidator* TimeDatatypeValidator::newInstance(
//
// caller need to release the date created here
//
-XMLDateTime* TimeDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* TimeDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -124,6 +129,8 @@ XMLDateTime* TimeDatatypeValidator::parse(const XMLCh* const content)
return pRetDate;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file TimeDatatypeValidator::cpp
*/
diff --git a/src/xercesc/validators/datatype/TimeDatatypeValidator.hpp b/src/xercesc/validators/datatype/TimeDatatypeValidator.hpp
index bd822ebd270298fe234407e0fbc4bf6b5b3acf20..f6824cd0d60da700a5ad525a8881ce7a1bbc78f2 100644
--- a/src/xercesc/validators/datatype/TimeDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/TimeDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -71,6 +74,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
#include <xercesc/util/RefVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT TimeDatatypeValidator : public DateTimeValidator
{
public:
@@ -109,8 +114,11 @@ protected:
virtual XMLDateTime* parse(const XMLCh* const);
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file TimeDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp b/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
index 35912004c3d321c416a028a7c7314b3fff243614..e85cff97093b1289828fd3a1a762cd2c5c5e3b1b 100644
--- a/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.4 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/24 19:44:40 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -92,6 +95,8 @@
#include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp>
#include <xercesc/util/NumberFormatException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
static const int BUF_LEN = 64;
static XMLCh value1[BUF_LEN+1];
static XMLCh value2[BUF_LEN+1];
@@ -395,6 +400,9 @@ const RefVectorOf<XMLCh>* UnionDatatypeValidator::getEnumString() const
{
return getEnumeration();
}
+
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file UnionDatatypeValidator.cpp
*/
diff --git a/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp b/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp
index 8d91b50d2bf865845f14d60f8f74ef6fc5b58a54..6ae2ef50225a863425fc075cb56da26a2bdc008a 100644
--- a/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/02/14 15:17:31 peiyongz
* getEnumString()
*
@@ -96,6 +99,8 @@
#include <xercesc/validators/datatype/DatatypeValidator.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT UnionDatatypeValidator : public DatatypeValidator
{
public:
@@ -328,7 +333,10 @@ inline bool UnionDatatypeValidator::isSubstitutableBy(const DatatypeValidator* c
return false;
}
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file UnionDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/YearDatatypeValidator.cpp b/src/xercesc/validators/datatype/YearDatatypeValidator.cpp
index 3f6d4a2113244b2dd0272dee628872543d14378b..5c903a38577ebebdf7367d143e2cd6a2dab3508e 100644
--- a/src/xercesc/validators/datatype/YearDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/YearDatatypeValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/YearDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@ DatatypeValidator* YearDatatypeValidator::newInstance(
//
// caller need to release the date created here
//
-XMLDateTime* YearDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* YearDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -124,6 +129,8 @@ XMLDateTime* YearDatatypeValidator::parse(const XMLCh* const content)
return pRetDate;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file YearDatatypeValidator::cpp
*/
diff --git a/src/xercesc/validators/datatype/YearDatatypeValidator.hpp b/src/xercesc/validators/datatype/YearDatatypeValidator.hpp
index 3925ca9f6f99e1d70d6c4d9a70d9e8628e7be1c3..cc428fa7bee4d4782a271ceee6c4cb0c0bc88458 100644
--- a/src/xercesc/validators/datatype/YearDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/YearDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -70,6 +73,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT YearDatatypeValidator : public DateTimeValidator
{
public:
@@ -108,8 +113,11 @@ protected:
virtual XMLDateTime* parse(const XMLCh* const);
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file YearDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/datatype/YearMonthDatatypeValidator.cpp b/src/xercesc/validators/datatype/YearMonthDatatypeValidator.cpp
index d8a7b8dfe1917776e1c615ccf9297fa9b4e67d36..82889acf9f085e1123b0b27588fd0eab7b4874ae 100644
--- a/src/xercesc/validators/datatype/YearMonthDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/YearMonthDatatypeValidator.cpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/15 17:09:23 peiyongz
* catch(...) only. (the invoker need to cath XMLException to display proper message)
@@ -76,6 +79,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/datatype/YearMonthDatatypeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -107,7 +112,7 @@ DatatypeValidator* YearMonthDatatypeValidator::newInstance(
//
// caller need to release the date created here
//
-XMLDateTime* YearMonthDatatypeValidator::parse(const XMLCh* const content)
+XMLDateTime* YearMonthDatatypeValidator::parse(const XMLCh* const content)
{
XMLDateTime *pRetDate = new XMLDateTime(content);
@@ -124,6 +129,8 @@ XMLDateTime* YearMonthDatatypeValidator::parse(const XMLCh* const content)
return pRetDate;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file YearMonthDatatypeValidator::cpp
*/
diff --git a/src/xercesc/validators/datatype/YearMonthDatatypeValidator.hpp b/src/xercesc/validators/datatype/YearMonthDatatypeValidator.hpp
index b109cedd586141d0ba94bf6e575cc05f22ac0498..9cf9608da4faa6acd76a947d44020f6b70a8845e 100644
--- a/src/xercesc/validators/datatype/YearMonthDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/YearMonthDatatypeValidator.hpp
@@ -57,8 +57,11 @@
/*
* $Id$
* $Log$
- * Revision 1.1 2002/02/01 22:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:53:28 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/07 19:18:52 peiyongz
* DateTime Port
@@ -70,6 +73,8 @@
#include <xercesc/validators/datatype/DateTimeValidator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class VALIDATORS_EXPORT YearMonthDatatypeValidator : public DateTimeValidator
{
public:
@@ -108,8 +113,11 @@ protected:
virtual XMLDateTime* parse(const XMLCh* const);
};
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
/**
* End of file YearMonthDatatypeValidator.hpp
*/
-#endif
diff --git a/src/xercesc/validators/schema/ComplexTypeInfo.cpp b/src/xercesc/validators/schema/ComplexTypeInfo.cpp
index cc6faf68f950d20e1b9a949a8d8ffa9c0f6ab638..21278192ecb518f598a3cb7a61f354d7f9387f62 100644
--- a/src/xercesc/validators/schema/ComplexTypeInfo.cpp
+++ b/src/xercesc/validators/schema/ComplexTypeInfo.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/03/21 15:34:40 knoaman
* Add support for reporting line/column numbers of schema errors.
*
@@ -162,6 +165,8 @@
#include <xercesc/validators/common/SimpleContentModel.hpp>
#include <xercesc/validators/schema/XSDLocator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ComplexTypeInfo: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -744,6 +749,7 @@ void ComplexTypeInfo::resizeContentSpecOrgURI() {
fContentSpecOrgURISize = newSize;
}
+XERCES_CPP_NAMESPACE_END
/**
* End of file ComplexTypeInfo.cpp
diff --git a/src/xercesc/validators/schema/ComplexTypeInfo.hpp b/src/xercesc/validators/schema/ComplexTypeInfo.hpp
index 03fc9c16689b7a5824d150fd5ac83f278128b550..62ebb9a9629f83375850c708a969100936e839b9 100644
--- a/src/xercesc/validators/schema/ComplexTypeInfo.hpp
+++ b/src/xercesc/validators/schema/ComplexTypeInfo.hpp
@@ -79,6 +79,8 @@
#include <xercesc/framework/XMLContentModel.hpp>
#include <xercesc/validators/schema/SchemaAttDef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declarations
@@ -518,6 +520,8 @@ inline bool ComplexTypeInfo::contains(const XMLCh* const attName) {
return false;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/schema/GeneralAttributeCheck.cpp b/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
index ae763c8eddd4afad4a3cc9d9d82a48e8e3311f65..64de3a4a8a1374ed59679c8060b9cfc7d38bc2f2 100644
--- a/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
+++ b/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.8 2002/09/27 13:22:52 tng
* [Bug 13073] GeneralAttributeCheck.cpp : compilation fails with Sun C++ 4.2 on Solaris2.7 system.
*
@@ -148,6 +151,8 @@
#include <xercesc/util/XMLRegisterCleanup.hpp>
#include <xercesc/validators/datatype/DatatypeValidatorFactory.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Local const data
// ---------------------------------------------------------------------------
@@ -927,6 +932,8 @@ const XMLCh* GeneralAttributeCheck::fAttNames[A_Count] =
SchemaSymbols::fgATT_XPATH,
};
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file GeneralAttributeCheck.cpp
*/
diff --git a/src/xercesc/validators/schema/GeneralAttributeCheck.hpp b/src/xercesc/validators/schema/GeneralAttributeCheck.hpp
index d164ba9248c4635ad649695dd8beb98f7bacb06d..d6aa639768220db219b574bb6d7f526f2e4e6e64 100644
--- a/src/xercesc/validators/schema/GeneralAttributeCheck.hpp
+++ b/src/xercesc/validators/schema/GeneralAttributeCheck.hpp
@@ -61,7 +61,6 @@
#if !defined(GENERALATTRIBUTECHECK_HPP)
#define GENERALATTRIBUTECHECK_HPP
-
/**
* A general purpose class to check for valid values of attributes, as well
* as check for proper association with corresponding schema elements.
@@ -76,6 +75,8 @@
#include <xercesc/validators/datatype/IDDatatypeValidator.hpp>
#include <xercesc/util/ValueHashTableOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward declaration
// ---------------------------------------------------------------------------
@@ -184,14 +185,14 @@ public:
A_Value,
A_Version,
A_XPath,
-
+
A_Count,
A_Invalid = -1
};
//Validators
enum {
-
+
DV_String = 0,
DV_AnyURI = 4,
DV_NonNegInt = 8,
@@ -205,7 +206,7 @@ public:
DV_Use = 2048,
DV_WhiteSpace = 4096,
- DV_Mask = (DV_AnyURI | DV_NonNegInt | DV_Boolean | DV_ID | DV_Form |
+ DV_Mask = (DV_AnyURI | DV_NonNegInt | DV_Boolean | DV_ID | DV_Form |
DV_MaxOccurs | DV_MaxOccurs1 | DV_MinOccurs1 |
DV_ProcessContents | DV_Use | DV_WhiteSpace)
};
@@ -307,6 +308,7 @@ GeneralAttributeCheck::setIDRefList(RefHashTableOf<XMLRefInfo>* const refList) {
fIDRefList = refList;
}
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/validators/schema/NamespaceScope.cpp b/src/xercesc/validators/schema/NamespaceScope.cpp
index a7d8c871475459abc6a2306112a78c9bb166d7a4..ce9f7f67eab1f67aeba393863de8d72ccb9e8784 100644
--- a/src/xercesc/validators/schema/NamespaceScope.cpp
+++ b/src/xercesc/validators/schema/NamespaceScope.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:45 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:45 peiyongz
+ * sane_include
*
* Revision 1.3 2001/07/31 15:26:54 knoaman
* Added support for <attributeGroup>.
@@ -77,6 +80,7 @@
#include <xercesc/util/EmptyStackException.hpp>
#include <xercesc/validators/schema/NamespaceScope.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// NamespaceScope: Constructors and Destructor
@@ -296,6 +300,7 @@ void NamespaceScope::expandStack()
fStackCapacity = newCapacity;
}
+XERCES_CPP_NAMESPACE_END
/**
* End of file NamespaceScope.cpp
diff --git a/src/xercesc/validators/schema/NamespaceScope.hpp b/src/xercesc/validators/schema/NamespaceScope.hpp
index 595bf7767122b8a968e075c6e10142042c4f76a0..790c2f1391b28653bb2038a678c4523f924b4f4c 100644
--- a/src/xercesc/validators/schema/NamespaceScope.hpp
+++ b/src/xercesc/validators/schema/NamespaceScope.hpp
@@ -64,6 +64,8 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/StringPool.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// NamespaceScope provides a data structure for mapping namespace prefixes
// to their URI's. The mapping accurately reflects the scoping of namespaces
@@ -192,6 +194,8 @@ inline bool NamespaceScope::isEmpty() const
return (fStackTop == 0);
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/schema/SchemaAttDef.cpp b/src/xercesc/validators/schema/SchemaAttDef.cpp
index 488d9383139afeb3c303284a0e08ca10681e9bc3..487c85c511238025a91d640ea75174fd8a464d17 100644
--- a/src/xercesc/validators/schema/SchemaAttDef.cpp
+++ b/src/xercesc/validators/schema/SchemaAttDef.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:45 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:45 peiyongz
+ * sane_include
*
* Revision 1.4 2001/08/09 15:23:16 knoaman
* add support for <anyAttribute> declaration.
@@ -80,6 +83,8 @@
#include <xercesc/framework/XMLElementDecl.hpp>
#include <xercesc/validators/schema/SchemaAttDef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// SchemaAttDef: Implementation of the XMLAttDef interface
// ---------------------------------------------------------------------------
@@ -138,7 +143,7 @@ SchemaAttDef::SchemaAttDef(const SchemaAttDef* other) :
, fNamespaceList(0)
{
QName* otherName = other->getAttName();
- fAttName = new QName(otherName->getPrefix(),
+ fAttName = new QName(otherName->getPrefix(),
otherName->getLocalPart(), otherName->getURI());
if (other->fNamespaceList && other->fNamespaceList->size()) {
@@ -162,3 +167,5 @@ void SchemaAttDef::setAttName(const XMLCh* const prefix
{
fAttName->setName(prefix, localPart, uriId);
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/schema/SchemaAttDef.hpp b/src/xercesc/validators/schema/SchemaAttDef.hpp
index 0a4220d307fad5634c46531771b4608922614fc7..43112d47263cbf365444d3beeb0d940c08c4f549 100644
--- a/src/xercesc/validators/schema/SchemaAttDef.hpp
+++ b/src/xercesc/validators/schema/SchemaAttDef.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:46 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:46 peiyongz
+ * sane_include
*
* Revision 1.6 2001/08/10 12:34:25 knoaman
* Fix compilation error.
@@ -85,6 +88,8 @@
#include <xercesc/framework/XMLAttDef.hpp>
#include <xercesc/util/ValueVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class DatatypeValidator;
class QName;
@@ -242,4 +247,6 @@ inline void SchemaAttDef::setNamespaceList(const ValueVectorOf<unsigned int>* co
}
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/schema/SchemaAttDefList.cpp b/src/xercesc/validators/schema/SchemaAttDefList.cpp
index cd266e8889c80ca6bec3a6e84090c5c25675b34c..1c3a2f516ca1e31b1d6f118342f3c2bf8d695754 100644
--- a/src/xercesc/validators/schema/SchemaAttDefList.cpp
+++ b/src/xercesc/validators/schema/SchemaAttDefList.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:46 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:46 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:27:34 tng
* Copyright update.
@@ -73,6 +76,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/SchemaAttDefList.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// SchemaAttDefList: Constructors and Destructor
@@ -152,3 +156,5 @@ void SchemaAttDefList::Reset()
{
fEnum->Reset();
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/schema/SchemaAttDefList.hpp b/src/xercesc/validators/schema/SchemaAttDefList.hpp
index 18f6e2bc9c90c913d99c6d7c43c52dbd4638695a..3544588c4f25a08a158a31d4bfe4530f2b520d82 100644
--- a/src/xercesc/validators/schema/SchemaAttDefList.hpp
+++ b/src/xercesc/validators/schema/SchemaAttDefList.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:46 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:46 peiyongz
+ * sane_include
*
* Revision 1.2 2001/05/11 13:27:34 tng
* Copyright update.
@@ -74,6 +77,7 @@
#include <xercesc/util/RefHash2KeysTableOf.hpp>
#include <xercesc/validators/schema/SchemaElementDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
//
// This is a derivative of the framework abstract class which defines the
@@ -147,4 +151,6 @@ private :
RefHash2KeysTableOf<SchemaAttDef>* fList;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/schema/SchemaElementDecl.cpp b/src/xercesc/validators/schema/SchemaElementDecl.cpp
index 642c32bdf324f515cb29a4ed9786c98a02558a39..549dca9d00af80c34d7c52c0fab9812490b7e914 100644
--- a/src/xercesc/validators/schema/SchemaElementDecl.cpp
+++ b/src/xercesc/validators/schema/SchemaElementDecl.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.5 2002/07/12 15:17:48 knoaman
* For a given global element, store info about a substitution group element
* as a SchemaElementDecl and not as a string.
@@ -140,6 +143,8 @@
#include <xercesc/validators/schema/SchemaElementDecl.hpp>
#include <xercesc/validators/schema/identity/IdentityConstraint.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// SchemaElementDecl: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -271,7 +276,7 @@ XMLAttDefList& SchemaElementDecl::getAttDefList() const
if (fXsiComplexTypeInfo) {
return fXsiComplexTypeInfo->getAttDefList();
}
- else if (!fComplexTypeInfo)
+ else if (!fComplexTypeInfo)
{
ThrowXML(RuntimeException, XMLExcepts::DV_InvalidOperation);
}
@@ -385,3 +390,4 @@ SchemaAttDef* SchemaElementDecl::getAttDef(const XMLCh* const baseName, const in
return 0;
}
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/schema/SchemaElementDecl.hpp b/src/xercesc/validators/schema/SchemaElementDecl.hpp
index 2595e6bde395237588352e40835624237fcf6e83..e8ad241ce0a3aa1963131d60b0a589d744affaef 100644
--- a/src/xercesc/validators/schema/SchemaElementDecl.hpp
+++ b/src/xercesc/validators/schema/SchemaElementDecl.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.6 2002/07/12 15:17:48 knoaman
* For a given global element, store info about a substitution group element
* as a SchemaElementDecl and not as a string.
@@ -134,6 +137,8 @@
#include <xercesc/validators/schema/ComplexTypeInfo.hpp>
#include <xercesc/validators/schema/identity/IdentityConstraint.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class ContentSpecNode;
class SchemaAttDefList;
class DatatypeValidator;
@@ -565,4 +570,6 @@ SchemaElementDecl::getIdentityConstraintAt(unsigned int index) const {
return 0;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/schema/SchemaGrammar.cpp b/src/xercesc/validators/schema/SchemaGrammar.cpp
index 0944207df40cdc3463839b877107064b87c62c88..5df70a996063128dbddefc684da543dfd942a802 100644
--- a/src/xercesc/validators/schema/SchemaGrammar.cpp
+++ b/src/xercesc/validators/schema/SchemaGrammar.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/07/11 18:21:20 knoaman
* Grammar caching/preparsing - initial implementation.
*
@@ -109,6 +112,7 @@
#include <xercesc/validators/schema/XercesGroupInfo.hpp>
#include <xercesc/validators/schema/XercesAttGroupInfo.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// SchemaGrammar: Constructors and Destructor
@@ -234,3 +238,4 @@ void SchemaGrammar::cleanUp()
delete fIDRefList;
}
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/schema/SchemaGrammar.hpp b/src/xercesc/validators/schema/SchemaGrammar.hpp
index 9c20a2ff41c80b259be1d3d7db4e828f27d7f818..4567cdc721278852f4e9775883dc91753a7d86c4 100644
--- a/src/xercesc/validators/schema/SchemaGrammar.hpp
+++ b/src/xercesc/validators/schema/SchemaGrammar.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/08/22 15:42:10 tng
* Remove unused parameter variables in inline functions.
*
@@ -125,6 +128,8 @@
#include <xercesc/validators/datatype/IDDatatypeValidator.hpp>
#include <xercesc/validators/datatype/DatatypeValidatorFactory.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This class stores the Schema information
// NOTE: Schemas are not namespace aware, so we just use regular NameIdPool
@@ -288,7 +293,7 @@ private:
//
// fElemDeclPool
// This is the element decl pool. It contains all of the elements
- // declared in the Schema (and their associated attributes.)
+ // declared in the Schema (and their associated attributes.)
//
// fElemNonDeclPool
// This is the element decl pool that is is populated as new elements
@@ -485,7 +490,7 @@ inline unsigned int SchemaGrammar::getElemId (const unsigned int uriId
inline const XMLElementDecl* SchemaGrammar::getElemDecl( const unsigned int uriId
, const XMLCh* const baseName
- , const XMLCh* const
+ , const XMLCh* const
, unsigned int scope ) const
{
const SchemaElementDecl* decl = fElemDeclPool->getByKey(baseName, uriId, scope);
@@ -503,7 +508,7 @@ inline const XMLElementDecl* SchemaGrammar::getElemDecl( const unsigned int u
inline XMLElementDecl* SchemaGrammar::getElemDecl (const unsigned int uriId
, const XMLCh* const baseName
- , const XMLCh* const
+ , const XMLCh* const
, unsigned int scope )
{
SchemaElementDecl* decl = fElemDeclPool->getByKey(baseName, uriId, scope);
@@ -582,4 +587,6 @@ inline void SchemaGrammar::setValidated(const bool newState)
fValidated = newState;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/schema/SchemaInfo.cpp b/src/xercesc/validators/schema/SchemaInfo.cpp
index 9c4a8ba46770e1ca0edffa7862db74371bc2db37..4ca54a681dd8df18534e7f5395eb8de86d110b33 100644
--- a/src/xercesc/validators/schema/SchemaInfo.cpp
+++ b/src/xercesc/validators/schema/SchemaInfo.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2002/11/04 14:49:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.8 2002/09/24 20:12:48 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -109,6 +112,8 @@
#include <xercesc/validators/schema/SchemaSymbols.hpp>
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// SchemaInfo: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -310,6 +315,8 @@ void SchemaInfo::updateImportingInfo(SchemaInfo* const importingInfo) {
}
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file SchemaInfo.cpp
*/
diff --git a/src/xercesc/validators/schema/SchemaInfo.hpp b/src/xercesc/validators/schema/SchemaInfo.hpp
index 208eb633e482d37b92b65ab860854d2fb873fc13..d9a0bc7633e136e955213b5687854dadb6eaeb08 100644
--- a/src/xercesc/validators/schema/SchemaInfo.hpp
+++ b/src/xercesc/validators/schema/SchemaInfo.hpp
@@ -81,6 +81,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/ValueVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class SchemaInfo
{
public:
@@ -434,6 +436,8 @@ inline void SchemaInfo::clearTopLevelComponents() {
}
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/schema/SchemaSymbols.cpp b/src/xercesc/validators/schema/SchemaSymbols.cpp
index e6ed53aab2316741df41c6dc1744860f117a3548..e6cae1af7b1812aeca89476ed7ed69852b073724 100644
--- a/src/xercesc/validators/schema/SchemaSymbols.cpp
+++ b/src/xercesc/validators/schema/SchemaSymbols.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/05/27 19:39:25 knoaman
* remove unused constants.
*
@@ -115,6 +118,7 @@
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// SchemaSymbols: Static data
@@ -972,7 +976,7 @@ const XMLCh SchemaSymbols::fgDT_POSITIVEINTEGER[] =
const XMLCh SchemaSymbols::fgDT_DATETIME[] =
{
- chLatin_d, chLatin_a, chLatin_t, chLatin_e,
+ chLatin_d, chLatin_a, chLatin_t, chLatin_e,
chLatin_T, chLatin_i, chLatin_m, chLatin_e, chNull
};
@@ -988,7 +992,7 @@ const XMLCh SchemaSymbols::fgDT_TIME[] =
const XMLCh SchemaSymbols::fgDT_DURATION[] =
{
- chLatin_d, chLatin_u, chLatin_r, chLatin_a,
+ chLatin_d, chLatin_u, chLatin_r, chLatin_a,
chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
};
@@ -1004,7 +1008,7 @@ const XMLCh SchemaSymbols::fgDT_MONTH[] =
const XMLCh SchemaSymbols::fgDT_MONTHDAY[] =
{
- chLatin_g, chLatin_M, chLatin_o, chLatin_n, chLatin_t, chLatin_h,
+ chLatin_g, chLatin_M, chLatin_o, chLatin_n, chLatin_t, chLatin_h,
chLatin_D, chLatin_a, chLatin_y, chNull
};
@@ -1015,7 +1019,7 @@ const XMLCh SchemaSymbols::fgDT_YEAR[] =
const XMLCh SchemaSymbols::fgDT_YEARMONTH[] =
{
- chLatin_g, chLatin_Y, chLatin_e, chLatin_a, chLatin_r,
+ chLatin_g, chLatin_Y, chLatin_e, chLatin_a, chLatin_r,
chLatin_M, chLatin_o, chLatin_n, chLatin_t, chLatin_h, chNull
};
@@ -1084,6 +1088,8 @@ const int SchemaSymbols::fgINT_MIN_VALUE = 0x80000000;
const int SchemaSymbols::fgINT_MAX_VALUE = 0x7fffffff;
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file SchemaSymbols.cpp
*/
diff --git a/src/xercesc/validators/schema/SchemaSymbols.hpp b/src/xercesc/validators/schema/SchemaSymbols.hpp
index 05b044e8912190466c98d26ed84f2a4c1ae69fc2..e9e3c81c0d934c972cfd68427fc865cf83c15ca0 100644
--- a/src/xercesc/validators/schema/SchemaSymbols.hpp
+++ b/src/xercesc/validators/schema/SchemaSymbols.hpp
@@ -63,6 +63,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/*
* Collection of symbols used to parse a Schema Grammar
*/
@@ -221,7 +223,7 @@ public :
static const XMLCh fgDT_USHORT[];
static const XMLCh fgDT_UBYTE[];
static const XMLCh fgDT_POSITIVEINTEGER[];
-//datetime
+//datetime
static const XMLCh fgDT_DATETIME[];
static const XMLCh fgDT_DATE[];
static const XMLCh fgDT_TIME[];
@@ -272,6 +274,8 @@ public :
};
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/schema/SchemaValidator.cpp b/src/xercesc/validators/schema/SchemaValidator.cpp
index 4900e7761545b2bf119b57cdd407fa1442561f64..69d343e0f768b20c1dbeb47d31a7c2c29b1b9f8f 100644
--- a/src/xercesc/validators/schema/SchemaValidator.cpp
+++ b/src/xercesc/validators/schema/SchemaValidator.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.17 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.16 2002/09/24 20:12:48 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -207,6 +210,8 @@
#include <xercesc/validators/schema/XercesGroupInfo.hpp>
#include <xercesc/validators/schema/XSDLocator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// SchemaValidator: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -1895,3 +1900,4 @@ SchemaValidator::checkMapAndSum(SchemaGrammar* const currentGrammar,
}
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/schema/SchemaValidator.hpp b/src/xercesc/validators/schema/SchemaValidator.hpp
index 451c6d252d0bb7a0100a4bc4e9cf6790957f51da..b7df666442df6a0830d2ff97f82f171d13a8a115 100644
--- a/src/xercesc/validators/schema/SchemaValidator.hpp
+++ b/src/xercesc/validators/schema/SchemaValidator.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.8 2002/09/04 18:17:41 tng
* Do not set IDREF to used during prevalidation.
*
@@ -127,6 +130,8 @@
#include <xercesc/validators/schema/SchemaGrammar.hpp>
#include <xercesc/validators/schema/XSDErrorReporter.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
//
// This is a derivative of the abstract validator interface. This class
// implements a validator that supports standard XML Schema semantics.
@@ -428,4 +433,6 @@ SchemaValidator::isOccurrenceRangeOK(const int min1, const int max1,
return false;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/schema/SubstitutionGroupComparator.cpp b/src/xercesc/validators/schema/SubstitutionGroupComparator.cpp
index 3666c70eabb66e4cbb8609dac571a4c1ce5f49aa..8938cb3836279cebe9b30afecd9d0bf36d0b29c8 100644
--- a/src/xercesc/validators/schema/SubstitutionGroupComparator.cpp
+++ b/src/xercesc/validators/schema/SubstitutionGroupComparator.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/09/24 20:12:48 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -112,6 +115,8 @@
#include <xercesc/validators/schema/ComplexTypeInfo.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
bool SubstitutionGroupComparator::isEquivalentTo(QName* const anElement
, QName* const exemplar)
{
@@ -266,6 +271,8 @@ bool SubstitutionGroupComparator::isAllowedByWildcard(SchemaGrammar* const pGram
return false;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file SubstitutionGroupComparator.cpp
*/
diff --git a/src/xercesc/validators/schema/SubstitutionGroupComparator.hpp b/src/xercesc/validators/schema/SubstitutionGroupComparator.hpp
index 4ed293e6f5bfa79d3e0fc5749efaafc1b054b853..c3d009e3f4b1ddb6484a81816c5e2cdd2715fa62 100644
--- a/src/xercesc/validators/schema/SubstitutionGroupComparator.hpp
+++ b/src/xercesc/validators/schema/SubstitutionGroupComparator.hpp
@@ -65,6 +65,8 @@
#include <xercesc/util/QName.hpp>
#include <xercesc/validators/common/GrammarResolver.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class SchemaGrammar;
class VALIDATORS_EXPORT SubstitutionGroupComparator
@@ -154,6 +156,8 @@ inline SubstitutionGroupComparator::SubstitutionGroupComparator(GrammarResolver*
inline SubstitutionGroupComparator::~SubstitutionGroupComparator()
{}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/schema/TraverseSchema.cpp b/src/xercesc/validators/schema/TraverseSchema.cpp
index 53b16bb1e6df12e18f1717095e353737a11ad65d..77cb206552b8fb043d0ecb3356f2810137b971cb 100644
--- a/src/xercesc/validators/schema/TraverseSchema.cpp
+++ b/src/xercesc/validators/schema/TraverseSchema.cpp
@@ -92,6 +92,8 @@
#include <xercesc/dom/DOMNamedNodeMap.hpp>
#include <xercesc/dom/impl/XSDElementNSImpl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// TraverseSchema: Local declaration
// ---------------------------------------------------------------------------
@@ -7712,6 +7714,8 @@ void TraverseSchema::cleanUp() {
delete fParser;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file TraverseSchema.cpp
*/
diff --git a/src/xercesc/validators/schema/TraverseSchema.hpp b/src/xercesc/validators/schema/TraverseSchema.hpp
index 295a9671aee224be3cbf487b57d7e5f897a1627f..0a0ff2ffeee3c652570afb0e533f7d919dae2e36 100644
--- a/src/xercesc/validators/schema/TraverseSchema.hpp
+++ b/src/xercesc/validators/schema/TraverseSchema.hpp
@@ -83,6 +83,8 @@
#include <xercesc/validators/schema/GeneralAttributeCheck.hpp>
#include <xercesc/validators/schema/XSDErrorReporter.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declarations
// ---------------------------------------------------------------------------
@@ -946,7 +948,7 @@ inline void TraverseSchema::normalizeURI(const XMLCh* const systemURI,
}
else if (*pszSrc == 0xFFFF) { //escaped character
pszSrc++;
- }
+ }
else {
normalizedURI.append(*pszSrc);
pszSrc++;
@@ -954,6 +956,8 @@ inline void TraverseSchema::normalizeURI(const XMLCh* const systemURI,
}
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/schema/XSDDOMParser.cpp b/src/xercesc/validators/schema/XSDDOMParser.cpp
index e661451a35912ec20cfd93aad466529e3d275cca..e793fa48cf1b6d85677a6b9ed153a2f1e9e593d5 100644
--- a/src/xercesc/validators/schema/XSDDOMParser.cpp
+++ b/src/xercesc/validators/schema/XSDDOMParser.cpp
@@ -67,6 +67,7 @@
#include <xercesc/dom/DOMDocument.hpp>
#include <xercesc/internal/XMLScanner.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XSDDOMParser: Constructors and Destructor
@@ -144,3 +145,4 @@ InputSource* XSDDOMParser::resolveEntity(const XMLCh* const publicId,
return 0;
}
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/schema/XSDDOMParser.hpp b/src/xercesc/validators/schema/XSDDOMParser.hpp
index 79c81d7af2319ec77911c89b56765b4c2edb1129..c54d8e3576d9ef6122e7da9e2f7b1744187090b4 100644
--- a/src/xercesc/validators/schema/XSDDOMParser.hpp
+++ b/src/xercesc/validators/schema/XSDDOMParser.hpp
@@ -65,6 +65,7 @@
#include <xercesc/parsers/XercesDOMParser.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class DOMElement;
class XMLValidator;
@@ -159,5 +160,6 @@ inline bool XSDDOMParser::getSawFatal() const
return fSawFatal;
}
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/validators/schema/XSDErrorReporter.cpp b/src/xercesc/validators/schema/XSDErrorReporter.cpp
index 4de23786f3d3622925e96564ff16a730dc90a828..0575724332ed951e5737e5a98f1aab6d908d43fc 100644
--- a/src/xercesc/validators/schema/XSDErrorReporter.cpp
+++ b/src/xercesc/validators/schema/XSDErrorReporter.cpp
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.4 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/24 20:12:48 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -85,6 +88,8 @@
#include <xercesc/validators/schema/XSDErrorReporter.hpp>
#include <xercesc/validators/schema/XSDLocator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Local static data
// ---------------------------------------------------------------------------
@@ -273,3 +278,4 @@ void XSDErrorReporter::emitError(const unsigned int toEmit,
throw toEmit;
}
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/schema/XSDErrorReporter.hpp b/src/xercesc/validators/schema/XSDErrorReporter.hpp
index 16446a771b9ee2a00e2b9a4c7340758d048da91e..36a45139df5fd9af60964a3110f3105634d3308d 100644
--- a/src/xercesc/validators/schema/XSDErrorReporter.hpp
+++ b/src/xercesc/validators/schema/XSDErrorReporter.hpp
@@ -62,6 +62,9 @@
#if !defined(XSDERRORREPORTER_HPP)
#define XSDERRORREPORTER_HPP
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
class Locator;
class XMLErrorReporter;
@@ -149,5 +152,6 @@ inline void XSDErrorReporter::setErrorReporter(XMLErrorReporter* const errorRepo
fErrorReporter = errorReporter;
}
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/validators/schema/XSDLocator.cpp b/src/xercesc/validators/schema/XSDLocator.cpp
index d97d8cc93b39fcdc391c0cbd5b1d92ced4a210c5..a205fcf7864c5b934b0a5522e7477aa5ed3e50a4 100644
--- a/src/xercesc/validators/schema/XSDLocator.cpp
+++ b/src/xercesc/validators/schema/XSDLocator.cpp
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.3 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/05/27 18:44:07 tng
* To get ready for 64 bit large file, use XMLSSize_t to represent line and column number.
*
@@ -70,6 +73,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/XSDLocator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XSDLocator: Constructors and Destructor
@@ -96,3 +100,5 @@ void XSDLocator::setValues(const XMLCh* const systemId,
fSystemId = systemId;
fPublicId = publicId;
}
+
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/schema/XSDLocator.hpp b/src/xercesc/validators/schema/XSDLocator.hpp
index 9f1535aeca1bec65c2eccef02ca5c98aa754a95e..fc4fdecde77cc3c99514ee8835f2b16de621d3f9 100644
--- a/src/xercesc/validators/schema/XSDLocator.hpp
+++ b/src/xercesc/validators/schema/XSDLocator.hpp
@@ -68,6 +68,7 @@
#include <xercesc/sax/Locator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class VALIDATORS_EXPORT XSDLocator: public Locator
{
@@ -174,4 +175,6 @@ inline const XMLCh* XSDLocator::getSystemId() const
return fSystemId;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/schema/XUtil.cpp b/src/xercesc/validators/schema/XUtil.cpp
index f7b1b183abc115d3f7a2f9723bc77fd55a886573..e4f362a55dd56ae026bb2c78a4a6edf6730f14c4 100644
--- a/src/xercesc/validators/schema/XUtil.cpp
+++ b/src/xercesc/validators/schema/XUtil.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/09/24 20:12:48 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -101,6 +104,8 @@
#include <xercesc/dom/DOMNamedNodeMap.hpp>
#include <xercesc/dom/DOMNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// Finds and returns the first child element node.
DOMElement* XUtil::getFirstChildElement(const DOMNode* const parent)
{
@@ -189,3 +194,4 @@ DOMElement* XUtil::getNextSiblingElementNS(const DOMNode* const node
return 0;
}
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/schema/XUtil.hpp b/src/xercesc/validators/schema/XUtil.hpp
index 490959ed0464f611c926eab6857e3dfc1be5dbb1..b6f0c1eecd2893a3d3f4073a3831ca945306d7e7 100644
--- a/src/xercesc/validators/schema/XUtil.hpp
+++ b/src/xercesc/validators/schema/XUtil.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/05/21 19:31:45 tng
* DOM Reorganization: modify to use the new DOM interface and remove obsolete code in XUtil.
*
@@ -84,6 +87,8 @@
#include <xercesc/dom/DOMNamedNodeMap.hpp>
#include <xercesc/dom/DOMNode.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
class DOMNode;
class DOMElement;
@@ -122,4 +127,6 @@ protected:
};
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/schema/XercesAttGroupInfo.cpp b/src/xercesc/validators/schema/XercesAttGroupInfo.cpp
index a5a122cbe9a9622f5dce26ef12b9837a363c3c1e..64b05d365ecb900e93f0d4233d63235bbe3c9abf 100644
--- a/src/xercesc/validators/schema/XercesAttGroupInfo.cpp
+++ b/src/xercesc/validators/schema/XercesAttGroupInfo.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 20:12:48 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -82,6 +85,8 @@
#include <xercesc/validators/schema/XercesAttGroupInfo.hpp>
#include <xercesc/util/QName.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// XercesAttGroupInfo: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -153,6 +158,8 @@ const SchemaAttDef* XercesAttGroupInfo::getAttDef(const XMLCh* const baseName,
return 0;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file XercesAttGroupInfo.cpp
*/
diff --git a/src/xercesc/validators/schema/XercesAttGroupInfo.hpp b/src/xercesc/validators/schema/XercesAttGroupInfo.hpp
index 8c2f7b73a0b552d378f7b915035529b25717bf7a..0ee1ec505a4da061013d194fcd78725b204dbc82 100644
--- a/src/xercesc/validators/schema/XercesAttGroupInfo.hpp
+++ b/src/xercesc/validators/schema/XercesAttGroupInfo.hpp
@@ -74,7 +74,7 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/validators/schema/SchemaAttDef.hpp>
-
+XERCES_CPP_NAMESPACE_BEGIN
class VALIDATORS_EXPORT XercesAttGroupInfo
{
@@ -90,7 +90,7 @@ public:
// -----------------------------------------------------------------------
bool containsTypeWithId() const;
unsigned int attributeCount() const;
- unsigned int anyAttributeCount() const;
+ unsigned int anyAttributeCount() const;
SchemaAttDef* attributeAt(const unsigned int index);
const SchemaAttDef* attributeAt(const unsigned int index) const;
SchemaAttDef* anyAttributeAt(const unsigned int index);
@@ -98,7 +98,7 @@ public:
SchemaAttDef* getCompleteWildCard() const;
const SchemaAttDef* getAttDef(const XMLCh* const baseName,
const int uriId) const;
-
+
// -----------------------------------------------------------------------
// Setter methods
// -----------------------------------------------------------------------
@@ -164,7 +164,7 @@ XercesAttGroupInfo::attributeAt(const unsigned int index) {
return 0;
}
-inline const SchemaAttDef*
+inline const SchemaAttDef*
XercesAttGroupInfo::attributeAt(const unsigned int index) const {
if (fAttributes) {
@@ -184,7 +184,7 @@ XercesAttGroupInfo::anyAttributeAt(const unsigned int index) {
return 0;
}
-inline const SchemaAttDef*
+inline const SchemaAttDef*
XercesAttGroupInfo::anyAttributeAt(const unsigned int index) const {
if (fAnyAttributes) {
@@ -226,7 +226,7 @@ inline void XercesAttGroupInfo::addAttDef(SchemaAttDef* const toAdd,
inline void XercesAttGroupInfo::addAnyAttDef(SchemaAttDef* const toAdd,
const bool toClone) {
- if (!fAnyAttributes) {
+ if (!fAnyAttributes) {
fAnyAttributes = new RefVectorOf<SchemaAttDef>(2);
}
@@ -248,6 +248,8 @@ XercesAttGroupInfo::setCompleteWildCard(SchemaAttDef* const toSet) {
fCompleteWildCard = toSet;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/schema/XercesElementWildcard.cpp b/src/xercesc/validators/schema/XercesElementWildcard.cpp
index 83e6e8e706e8a68bfa7f6a4d2151356b7a8cb6ff..2e8e0187a1990efdb32a0ecb852f6a1fa7cbe77e 100644
--- a/src/xercesc/validators/schema/XercesElementWildcard.cpp
+++ b/src/xercesc/validators/schema/XercesElementWildcard.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/21 14:30:13 knoaman
* Fix for UPA checking.
@@ -76,6 +79,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/XercesElementWildcard.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Local methods
@@ -163,3 +167,4 @@ bool XercesElementWildcard::wildcardIntersect(ContentSpecNode::NodeTypes t1,
return false;
}
+XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/schema/XercesElementWildcard.hpp b/src/xercesc/validators/schema/XercesElementWildcard.hpp
index 337ebada24e721817dede1fd1f9c065119f1abc9..f66852303b64b49dea6ffbe9d9081fa912533538 100644
--- a/src/xercesc/validators/schema/XercesElementWildcard.hpp
+++ b/src/xercesc/validators/schema/XercesElementWildcard.hpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
+ * sane_include
*
* Revision 1.2 2001/11/21 14:30:13 knoaman
* Fix for UPA checking.
@@ -76,6 +79,8 @@
#include <xercesc/validators/common/ContentSpecNode.hpp>
#include <xercesc/validators/schema/SubstitutionGroupComparator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward declarations
// ---------------------------------------------------------------------------
@@ -123,5 +128,7 @@ private:
~XercesElementWildcard();
};
+XERCES_CPP_NAMESPACE_END
+
#endif // XERCESELEMENTWILDCARD_HPP
diff --git a/src/xercesc/validators/schema/XercesGroupInfo.cpp b/src/xercesc/validators/schema/XercesGroupInfo.cpp
index 2046cd6b62cadff6908fc722120e2cc5134e4591..796383d7f06031a294b64d28c657e25483672d14 100644
--- a/src/xercesc/validators/schema/XercesGroupInfo.cpp
+++ b/src/xercesc/validators/schema/XercesGroupInfo.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:49:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/04/01 15:47:06 knoaman
* Move Element Consistency checking (ref to global declarations) to SchemaValidator.
*
@@ -80,6 +83,8 @@
#include <xercesc/validators/common/ContentSpecNode.hpp>
#include <xercesc/validators/schema/XSDLocator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// XercesGroupInfo: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -114,6 +119,8 @@ void XercesGroupInfo::setLocator(XSDLocator* const aLocator) {
fLocator = aLocator;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file XercesGroupInfo.cpp
*/
diff --git a/src/xercesc/validators/schema/XercesGroupInfo.hpp b/src/xercesc/validators/schema/XercesGroupInfo.hpp
index db6f1ade9c95620c5f4bb58061d581510428216b..bc499929d0b3d8525504a86e8b807afa276d66d0 100644
--- a/src/xercesc/validators/schema/XercesGroupInfo.hpp
+++ b/src/xercesc/validators/schema/XercesGroupInfo.hpp
@@ -74,6 +74,7 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/validators/schema/SchemaElementDecl.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Forward Declarations
@@ -149,13 +150,13 @@ inline ContentSpecNode* XercesGroupInfo::getContentSpec() const {
return fContentSpec;
}
-inline SchemaElementDecl*
+inline SchemaElementDecl*
XercesGroupInfo::elementAt(const unsigned int index) {
return fElements->elementAt(index);
}
-inline const SchemaElementDecl*
+inline const SchemaElementDecl*
XercesGroupInfo::elementAt(const unsigned int index) const {
return fElements->elementAt(index);
@@ -205,6 +206,8 @@ inline void XercesGroupInfo::setCheckElementConsistency(const bool aValue) {
fCheckElementConsistency = aValue;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/schema/identity/FieldActivator.cpp b/src/xercesc/validators/schema/identity/FieldActivator.cpp
index acf33250f9ad533327a706fda6c20fae02e727ac..9fc0fa301901082d2e0a95204209a2bc78b811e5 100644
--- a/src/xercesc/validators/schema/identity/FieldActivator.cpp
+++ b/src/xercesc/validators/schema/identity/FieldActivator.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/27 05:56:19 knoaman
* Identity Constraint: handle case of recursive elements.
*
@@ -75,6 +78,8 @@
#include <xercesc/validators/schema/identity/ValueStoreCache.hpp>
#include <xercesc/validators/schema/identity/XPathMatcherStack.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// FieldActivator: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -146,6 +151,8 @@ void FieldActivator::endValueScopeFor(const IdentityConstraint* const ic, const
valueStore->endValueScope();
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file FieldActivator.cpp
*/
diff --git a/src/xercesc/validators/schema/identity/FieldActivator.hpp b/src/xercesc/validators/schema/identity/FieldActivator.hpp
index 7d35baacf23b6ef37a57767a0a7fb229a36cd261..79ba13fc87413e0e638ebf416ea4c9ec47759e52 100644
--- a/src/xercesc/validators/schema/identity/FieldActivator.hpp
+++ b/src/xercesc/validators/schema/identity/FieldActivator.hpp
@@ -71,6 +71,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -107,13 +109,13 @@ public:
// Activation methods
// -----------------------------------------------------------------------
/**
- * Start the value scope for the specified identity constraint. This
- * method is called when the selector matches in order to initialize
+ * Start the value scope for the specified identity constraint. This
+ * method is called when the selector matches in order to initialize
* the value store.
*/
void startValueScopeFor(const IdentityConstraint* const ic, const int initialDepth);
- /**
+ /**
* Request to activate the specified field. This method returns the
* matcher for the field.
*/
@@ -147,6 +149,8 @@ FieldActivator::setMatcherStack(XPathMatcherStack* const matcherStack) {
fMatcherStack = matcherStack;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/schema/identity/FieldValueMap.cpp b/src/xercesc/validators/schema/identity/FieldValueMap.cpp
index 2f9f0dd8fe62d862a0b774613597821c1e0190c2..e85a2c14b902af2550bbd810f76f9ad9072591a3 100644
--- a/src/xercesc/validators/schema/identity/FieldValueMap.cpp
+++ b/src/xercesc/validators/schema/identity/FieldValueMap.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/02 14:08:40 knoaman
* Add support for identity constraints.
@@ -69,6 +72,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/FieldValueMap.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// FieldValueMap: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -133,6 +138,8 @@ int FieldValueMap::indexOf(const IC_Field* const key) const {
return -1;
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file FieldValueMap.cpp
*/
diff --git a/src/xercesc/validators/schema/identity/FieldValueMap.hpp b/src/xercesc/validators/schema/identity/FieldValueMap.hpp
index b48de62cb8c5ae75ef51d583032303676eb65f6d..30eddf2b4c5721f30ff66a120ba1c6a6e3e1d61d 100644
--- a/src/xercesc/validators/schema/identity/FieldValueMap.hpp
+++ b/src/xercesc/validators/schema/identity/FieldValueMap.hpp
@@ -72,6 +72,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/ValueVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Forward Declaration
@@ -129,7 +130,7 @@ private:
// ---------------------------------------------------------------------------
// FieldValueMap: Getter methods
// ---------------------------------------------------------------------------
-inline DatatypeValidator*
+inline DatatypeValidator*
FieldValueMap::getDatatypeValidatorAt(const unsigned int index) const {
if (fValidators) {
@@ -215,6 +216,7 @@ inline void FieldValueMap::put(IC_Field* const key,
}
}
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/validators/schema/identity/IC_Field.cpp b/src/xercesc/validators/schema/identity/IC_Field.cpp
index d931fa5c22a60d66a2ada1f8fc266c8974cbeb8f..66ae8159ba407c8f34de08c4b0549b108d144db7 100644
--- a/src/xercesc/validators/schema/identity/IC_Field.cpp
+++ b/src/xercesc/validators/schema/identity/IC_Field.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
+ * sane_include
*
* Revision 1.2 2001/11/15 17:10:19 knoaman
* Particle derivation checking support.
@@ -74,6 +77,7 @@
#include <xercesc/validators/schema/identity/ValueStore.hpp>
#include <xercesc/validators/schema/identity/XercesXPath.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// FieldMatcher: Constructors and Destructor
@@ -90,7 +94,7 @@ FieldMatcher::FieldMatcher(XercesXPath* const xpath, IC_Field* const aField,
// FieldMatcher: Match methods
// ---------------------------------------------------------------------------
void FieldMatcher::matched(const XMLCh* const content,
- DatatypeValidator* const dv,
+ DatatypeValidator* const dv,
const bool isNil) {
if(isNil) {
@@ -142,6 +146,8 @@ XPathMatcher* IC_Field::createMatcher(ValueStore* const valueStore) {
return new FieldMatcher(fXPath, this, valueStore);
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file IC_Field.cpp
*/
diff --git a/src/xercesc/validators/schema/identity/IC_Field.hpp b/src/xercesc/validators/schema/identity/IC_Field.hpp
index d417ef1aef57253bfb5954849d638f203c7d9476..1a60b59c4a8fc12d2b796622fc590e36ec480e0f 100644
--- a/src/xercesc/validators/schema/identity/IC_Field.hpp
+++ b/src/xercesc/validators/schema/identity/IC_Field.hpp
@@ -67,6 +67,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/XPathMatcher.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -167,6 +169,8 @@ private:
IC_Field* fField;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/schema/identity/IC_Key.cpp b/src/xercesc/validators/schema/identity/IC_Key.cpp
index 6b229d067245d809c8c963add3117cb0806f9470..fe0702bda1cc202f105a015dffca918f96a6ac0d 100644
--- a/src/xercesc/validators/schema/identity/IC_Key.cpp
+++ b/src/xercesc/validators/schema/identity/IC_Key.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/02 14:08:40 knoaman
* Add support for identity constraints.
@@ -69,6 +72,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/IC_Key.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// IC_Key: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -83,6 +88,8 @@ IC_Key::~IC_Key()
{
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file IC_Key.cpp
*/
diff --git a/src/xercesc/validators/schema/identity/IC_Key.hpp b/src/xercesc/validators/schema/identity/IC_Key.hpp
index a34deb8a618f11ce301cb19b20fe0cf7054640ee..20f5824453e3efcab7a7805eb0b956d71fabedcb 100644
--- a/src/xercesc/validators/schema/identity/IC_Key.hpp
+++ b/src/xercesc/validators/schema/identity/IC_Key.hpp
@@ -67,6 +67,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/IdentityConstraint.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class VALIDATORS_EXPORT IC_Key: public IdentityConstraint
{
@@ -100,6 +101,7 @@ inline short IC_Key::getType() const {
return IdentityConstraint::KEY;
}
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/validators/schema/identity/IC_KeyRef.cpp b/src/xercesc/validators/schema/identity/IC_KeyRef.cpp
index ccdb7a1b983bdc74d957d4eeb3182e4ea5c63704..89b4b77dd19e6eeb69d4cd549a395351d8ede4db 100644
--- a/src/xercesc/validators/schema/identity/IC_KeyRef.cpp
+++ b/src/xercesc/validators/schema/identity/IC_KeyRef.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/02 14:08:40 knoaman
* Add support for identity constraints.
@@ -69,6 +72,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/IC_KeyRef.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// IC_KeyRef: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -85,6 +90,8 @@ IC_KeyRef::~IC_KeyRef()
{
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file IC_KeyRef.cpp
*/
diff --git a/src/xercesc/validators/schema/identity/IC_KeyRef.hpp b/src/xercesc/validators/schema/identity/IC_KeyRef.hpp
index f5abbfba3d8d21f7cbe72cce1aeef64382f6affc..f17d6ddeb239f3f52c937b3fb20ffdd800c40705 100644
--- a/src/xercesc/validators/schema/identity/IC_KeyRef.hpp
+++ b/src/xercesc/validators/schema/identity/IC_KeyRef.hpp
@@ -67,6 +67,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/IdentityConstraint.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class VALIDATORS_EXPORT IC_KeyRef: public IdentityConstraint
{
@@ -112,6 +113,7 @@ inline IdentityConstraint* IC_KeyRef::getKey() const {
return fKey;
}
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/validators/schema/identity/IC_Selector.cpp b/src/xercesc/validators/schema/identity/IC_Selector.cpp
index 33f55da98eae36378bff6a52340a6b34986f87b6..f322ae9bf4ca9346af49708ed92f684c1fb123f6 100644
--- a/src/xercesc/validators/schema/identity/IC_Selector.cpp
+++ b/src/xercesc/validators/schema/identity/IC_Selector.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/08/27 05:56:19 knoaman
* Identity Constraint: handle case of recursive elements.
*
@@ -82,6 +85,8 @@
#include <xercesc/validators/schema/identity/IdentityConstraint.hpp>
#include <xercesc/validators/schema/identity/FieldActivator.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// SelectorMatcher: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -184,6 +189,8 @@ XPathMatcher* IC_Selector::createMatcher(FieldActivator* const fieldActivator, c
return new SelectorMatcher(fXPath, this, fieldActivator, initialDepth);
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file IC_Selector.cpp
*/
diff --git a/src/xercesc/validators/schema/identity/IC_Selector.hpp b/src/xercesc/validators/schema/identity/IC_Selector.hpp
index a990ade0849511bd0755bee06b6d3a4726baafff..3285b683bece40450569d460cc70abc0087d6298 100644
--- a/src/xercesc/validators/schema/identity/IC_Selector.hpp
+++ b/src/xercesc/validators/schema/identity/IC_Selector.hpp
@@ -67,6 +67,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/XPathMatcher.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -164,6 +166,8 @@ private:
FieldActivator* fFieldActivator;
};
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/schema/identity/IC_Unique.cpp b/src/xercesc/validators/schema/identity/IC_Unique.cpp
index c8794ea53ce5c5d60234a530a7f040648ebd4b2f..e95c2cd97bfaf78f19aff99c1d1ac1889feb5186 100644
--- a/src/xercesc/validators/schema/identity/IC_Unique.cpp
+++ b/src/xercesc/validators/schema/identity/IC_Unique.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/02 14:08:40 knoaman
* Add support for identity constraints.
@@ -69,6 +72,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/IC_Unique.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// IC_Unique: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -83,6 +88,8 @@ IC_Unique::~IC_Unique()
{
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file IC_Unique.cpp
*/
diff --git a/src/xercesc/validators/schema/identity/IC_Unique.hpp b/src/xercesc/validators/schema/identity/IC_Unique.hpp
index e6e68e731e5e12901d267216bf335e84f6921405..f47cc4aa61ac700c2a28bf4dbd14d057a7e40150 100644
--- a/src/xercesc/validators/schema/identity/IC_Unique.hpp
+++ b/src/xercesc/validators/schema/identity/IC_Unique.hpp
@@ -71,6 +71,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/IdentityConstraint.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class VALIDATORS_EXPORT IC_Unique: public IdentityConstraint
{
@@ -104,6 +105,7 @@ inline short IC_Unique::getType() const {
return IdentityConstraint::UNIQUE;
}
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/validators/schema/identity/IdentityConstraint.cpp b/src/xercesc/validators/schema/identity/IdentityConstraint.cpp
index c053970994b7a5e7371ef9cd6fe964a2e0460c8d..519b4908dcd65bfa2de30e09c84d1b820a9b5cf9 100644
--- a/src/xercesc/validators/schema/identity/IdentityConstraint.cpp
+++ b/src/xercesc/validators/schema/identity/IdentityConstraint.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/09/24 19:57:20 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -78,6 +81,8 @@
#include <xercesc/validators/schema/identity/IC_Field.hpp>
#include <xercesc/util/XMLString.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// IdentityConstraint: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -160,7 +165,7 @@ void IdentityConstraint::cleanUp() {
delete fSelector;
}
-
+XERCES_CPP_NAMESPACE_END
/**
* End of file IdentityConstraint.cpp
diff --git a/src/xercesc/validators/schema/identity/IdentityConstraint.hpp b/src/xercesc/validators/schema/identity/IdentityConstraint.hpp
index 0a09bc094d420506348c9bfe7818d6ccdc219dc8..eb2c7127ded4d20c2c6ce4bb97bf3e721facd589 100644
--- a/src/xercesc/validators/schema/identity/IdentityConstraint.hpp
+++ b/src/xercesc/validators/schema/identity/IdentityConstraint.hpp
@@ -72,6 +72,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/validators/schema/identity/IC_Field.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declarations
// ---------------------------------------------------------------------------
@@ -219,6 +221,8 @@ inline IC_Field* IdentityConstraint::getFieldAt(const unsigned int index) {
return 0;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/schema/identity/ValueStore.cpp b/src/xercesc/validators/schema/identity/ValueStore.cpp
index 2cd850274bc5b5d1d247533d878595e79a698f9c..93ae7060fb8c9d2af8a33aab4da045de54a6e1e6 100644
--- a/src/xercesc/validators/schema/identity/ValueStore.cpp
+++ b/src/xercesc/validators/schema/identity/ValueStore.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/09/24 19:57:20 tng
* Performance: use XMLString::equals instead of XMLString::compareString
*
@@ -85,6 +88,8 @@
#include <xercesc/validators/schema/identity/IC_KeyRef.hpp>
#include <xercesc/validators/schema/identity/ValueStoreCache.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ValueStore: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -376,6 +381,8 @@ void ValueStore::duplicateValue() {
}
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file ValueStore.cpp
*/
diff --git a/src/xercesc/validators/schema/identity/ValueStore.hpp b/src/xercesc/validators/schema/identity/ValueStore.hpp
index 4cc9fdd074e38c0b5c0d6297e28b293e6362223b..7ae03911f4ed399625a19a9868be9890b856e81b 100644
--- a/src/xercesc/validators/schema/identity/ValueStore.hpp
+++ b/src/xercesc/validators/schema/identity/ValueStore.hpp
@@ -62,7 +62,7 @@
#define VALUESTORE_HPP
/**
- * This class stores values associated to an identity constraint.
+ * This class stores values associated to an identity constraint.
* Each value stored corresponds to a field declared for the identity
* constraint.
*/
@@ -72,6 +72,8 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/FieldValueMap.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -114,7 +116,7 @@ public:
// -----------------------------------------------------------------------
void duplicateValue();
void reportNilError(IdentityConstraint* const ic);
-
+
private:
// -----------------------------------------------------------------------
// Unimplemented contstructors and operators
@@ -125,7 +127,7 @@ private:
// -----------------------------------------------------------------------
// Helper methods
// -----------------------------------------------------------------------
- /**
+ /**
* Returns whether a field associated <DatatypeValidator, String> value
* is a duplicate of another associated value.
* It is a duplicate only if either of these conditions are true:
@@ -157,6 +159,8 @@ ValueStore::getIdentityConstraint() const {
return fIdentityConstraint;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/schema/identity/ValueStoreCache.cpp b/src/xercesc/validators/schema/identity/ValueStoreCache.cpp
index ae2273dcec90438cf1f66dd93ac8017928f7a19c..2047ab9d1f10966cb965e453762b831e50643b9e 100644
--- a/src/xercesc/validators/schema/identity/ValueStoreCache.cpp
+++ b/src/xercesc/validators/schema/identity/ValueStoreCache.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.4 2002/08/28 13:41:20 knoaman
* missing type info.
*
@@ -81,6 +84,8 @@
#include <xercesc/validators/schema/SchemaElementDecl.hpp>
#include <xercesc/util/HashPtr.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// ValueStoreCache: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -201,6 +206,8 @@ void ValueStoreCache::transplant(IdentityConstraint* const ic, const int initial
}
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file ValueStoreCache.cpp
*/
diff --git a/src/xercesc/validators/schema/identity/ValueStoreCache.hpp b/src/xercesc/validators/schema/identity/ValueStoreCache.hpp
index ee8df23a1512e84a965ee9116bb82d8f2703ea66..c4143192a368802bec3f6f6900aefb7eac21cd19 100644
--- a/src/xercesc/validators/schema/identity/ValueStoreCache.hpp
+++ b/src/xercesc/validators/schema/identity/ValueStoreCache.hpp
@@ -89,6 +89,8 @@
#include <xercesc/validators/schema/identity/IdentityConstraint.hpp>
#include <xercesc/validators/schema/identity/IC_Field.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declcaration
// ---------------------------------------------------------------------------
@@ -199,6 +201,7 @@ ValueStoreCache::getGlobalValueStoreFor(const IdentityConstraint* const ic) {
inline void ValueStoreCache::endDocument() {
}
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/validators/schema/identity/XPathException.hpp b/src/xercesc/validators/schema/identity/XPathException.hpp
index 79e9c2afe4fe692ca3de5b447fc84cf8b3317408..9d463815774d2375889576619e84355f55b3dbef 100644
--- a/src/xercesc/validators/schema/identity/XPathException.hpp
+++ b/src/xercesc/validators/schema/identity/XPathException.hpp
@@ -65,7 +65,10 @@
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
MakeXMLException(XPathException, VALIDATORS_EXPORT)
+XERCES_CPP_NAMESPACE_END
+
#endif
diff --git a/src/xercesc/validators/schema/identity/XPathMatcher.cpp b/src/xercesc/validators/schema/identity/XPathMatcher.cpp
index 4df0c04248cc90e70f734c3e9f8e29986a52cf26..192e919cbb7804e0e15dd658997a8044265568c2 100644
--- a/src/xercesc/validators/schema/identity/XPathMatcher.cpp
+++ b/src/xercesc/validators/schema/identity/XPathMatcher.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
* Revision 1.3 2002/08/27 05:56:19 knoaman
* Identity Constraint: handle case of recursive elements.
*
@@ -83,6 +86,8 @@
#include <xercesc/validators/schema/SchemaSymbols.hpp>
#include <xercesc/util/RuntimeException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// XPathMatcher: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -109,7 +114,7 @@ XPathMatcher::XPathMatcher(XercesXPath* const xpath)
}
-XPathMatcher::XPathMatcher(XercesXPath* const xpath,
+XPathMatcher::XPathMatcher(XercesXPath* const xpath,
const bool shouldBufferContent,
IdentityConstraint* const ic)
: fShouldBufferContent(shouldBufferContent)
@@ -196,7 +201,7 @@ void XPathMatcher::startElement(const XMLElementDecl& elemDecl,
for (int i = 0; i < (int) fLocationPathSize; i++) {
- // push context
+ // push context
int startStep = fCurrentStep[i];
fStepIndexes->elementAt(i)->push(startStep);
@@ -227,7 +232,7 @@ void XPathMatcher::startElement(const XMLElementDecl& elemDecl,
continue;
}
-
+
// now if the current step is a descendant step, we let the next
// step do its thing; if it fails, we reset ourselves
// to look at this step for next time we're called.
@@ -364,7 +369,7 @@ void XPathMatcher::endElement(const XMLElementDecl& elemDecl) {
for(; j<i && !fMatched[j]; j++) ;
- if (j < i)
+ if (j < i)
continue;
if (fBufferContent) {
@@ -420,6 +425,8 @@ int XPathMatcher::getInitialDepth() const
return 0; // to make some compilers happy
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file XPathMatcher.cpp
*/
diff --git a/src/xercesc/validators/schema/identity/XPathMatcher.hpp b/src/xercesc/validators/schema/identity/XPathMatcher.hpp
index 31d5bca756f6451f96c380235eddb947d906d17a..37be6ed6f88c1e9dace784fc6bb5fe1322fef02c 100644
--- a/src/xercesc/validators/schema/identity/XPathMatcher.hpp
+++ b/src/xercesc/validators/schema/identity/XPathMatcher.hpp
@@ -69,6 +69,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/framework/XMLBuffer.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declaration
// ---------------------------------------------------------------------------
@@ -99,7 +101,7 @@ public:
// -----------------------------------------------------------------------
// Match methods
// -----------------------------------------------------------------------
- /**
+ /**
* Returns true if XPath has been matched.
*/
bool isMatched();
@@ -137,7 +139,7 @@ private:
void init(XercesXPath* const xpath);
void cleanUp();
- /**
+ /**
* Clears the match values.
*/
void clear();
@@ -198,6 +200,7 @@ inline void XPathMatcher::cleanUp() {
delete fStepIndexes;
}
+XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/validators/schema/identity/XPathMatcherStack.cpp b/src/xercesc/validators/schema/identity/XPathMatcherStack.cpp
index 1aa7d3bd97ec2e1d59e1fcbea9370ee7c3c058c0..2875f2aaf9e650fb6200c9668186333beb3dfab0 100644
--- a/src/xercesc/validators/schema/identity/XPathMatcherStack.cpp
+++ b/src/xercesc/validators/schema/identity/XPathMatcherStack.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:51 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:51 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/02 14:08:40 knoaman
* Add support for identity constraints.
@@ -69,6 +72,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/XPathMatcherStack.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// XPathMatherStack: Constructors and Destructor
@@ -104,6 +108,7 @@ void XPathMatcherStack::clear() {
fMatchersCount = 0;
}
+XERCES_CPP_NAMESPACE_END
/**
* End of file XPathMatcherStack.cpp
diff --git a/src/xercesc/validators/schema/identity/XPathMatcherStack.hpp b/src/xercesc/validators/schema/identity/XPathMatcherStack.hpp
index f809011f86f42c816993e908dd08365193197f3d..80088d3539f20cc9c8909228455e66ff6070a41f 100644
--- a/src/xercesc/validators/schema/identity/XPathMatcherStack.hpp
+++ b/src/xercesc/validators/schema/identity/XPathMatcherStack.hpp
@@ -67,6 +67,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/validators/schema/identity/XPathMatcher.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
class VALIDATORS_EXPORT XPathMatcherStack
{
@@ -154,7 +155,7 @@ inline void XPathMatcherStack::addMatcher(XPathMatcher* const matcher) {
if (fMatchersCount == fMatchers->size()) {
- fMatchers->addElement(matcher);
+ fMatchers->addElement(matcher);
fMatchersCount++;
}
else {
@@ -162,6 +163,8 @@ inline void XPathMatcherStack::addMatcher(XPathMatcher* const matcher) {
}
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/schema/identity/XPathSymbols.cpp b/src/xercesc/validators/schema/identity/XPathSymbols.cpp
index 9c09ed048b58ea8e3a1e75d5cc3ac68bdeb7e25e..81ea1638de2a416ac1dbb90bcb64cd9484b86fc8 100644
--- a/src/xercesc/validators/schema/identity/XPathSymbols.cpp
+++ b/src/xercesc/validators/schema/identity/XPathSymbols.cpp
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:51 peiyongz
- * Initial revision
+ * Revision 1.2 2002/11/04 14:47:41 tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:51 peiyongz
+ * sane_include
*
* Revision 1.1 2001/11/02 14:08:40 knoaman
* Add support for identity constraints.
@@ -71,6 +74,8 @@
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/validators/schema/identity/XPathSymbols.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// SchemaSymbols: Static data
// ---------------------------------------------------------------------------
@@ -196,6 +201,8 @@ const XMLCh XPathSymbols::fgSYMBOL_SELF[] =
chLatin_s, chLatin_e, chLatin_l, chLatin_f, chNull
};
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file XPathSymbols.cpp
*/
diff --git a/src/xercesc/validators/schema/identity/XPathSymbols.hpp b/src/xercesc/validators/schema/identity/XPathSymbols.hpp
index 7396d58d5ffa8fe062969d43aa17bb3f64d12774..20cf4e7bc88b1b5f5dbeeccda5f0bf5723da5840 100644
--- a/src/xercesc/validators/schema/identity/XPathSymbols.hpp
+++ b/src/xercesc/validators/schema/identity/XPathSymbols.hpp
@@ -63,6 +63,8 @@
#include <xercesc/util/XercesDefs.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
/*
* Collection of symbols used to parse a Schema Grammar
*/
@@ -97,6 +99,8 @@ public :
};
+XERCES_CPP_NAMESPACE_END
+
#endif
/**
diff --git a/src/xercesc/validators/schema/identity/XercesXPath.cpp b/src/xercesc/validators/schema/identity/XercesXPath.cpp
index acef9aa39808a356509bc617ef7b2fddf9b4bc83..4a0c2976c7d9f424ebe9417b6e550d0e54771947 100644
--- a/src/xercesc/validators/schema/identity/XercesXPath.cpp
+++ b/src/xercesc/validators/schema/identity/XercesXPath.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/11/04 14:47:42 tng
+ * C++ Namespace Support.
+ *
* Revision 1.2 2002/10/30 21:52:01 tng
* [Bug 13641] compiler-generated copy-constructor for QName doesn't do the right thing.
*
@@ -86,11 +89,13 @@
#include <xercesc/internal/XMLReader.hpp>
#include <xercesc/util/RuntimeException.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Static data
// ---------------------------------------------------------------------------
-const XMLByte XPathScanner::fASCIICharMap[128] =
+const XMLByte XPathScanner::fASCIICharMap[128] =
{
0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 2, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -326,7 +331,7 @@ void XercesXPath::checkForSelectedAttributes() {
if (stepSize) {
if (locPath->getStep(stepSize - 1)->getAxisType() == XercesStep::ATTRIBUTE) {
ThrowXML(XPathException, XMLExcepts::XPath_NoAttrSelector);
- }
+ }
}
}
}
@@ -454,7 +459,7 @@ void XercesXPath::parseExpression(XMLStringPool* const stringPool,
firstTokenOfLocationPath=false;
break;
}
- case XercesXPath::EXPRTOKEN_DOUBLE_COLON:
+ case XercesXPath::EXPRTOKEN_DOUBLE_COLON:
{
// should never have a bare double colon
ThrowXML(XPathException, XMLExcepts::XPath_NoDoubleColon);
@@ -557,21 +562,21 @@ void XercesXPath::parseExpression(XMLStringPool* const stringPool,
}
case XercesXPath::EXPRTOKEN_OPERATOR_DOUBLE_SLASH:
{
- ThrowXML(XPathException, XMLExcepts::XPath_NoDoubleForwardSlash);
+ ThrowXML(XPathException, XMLExcepts::XPath_NoDoubleForwardSlash);
}
case XercesXPath::EXPRTOKEN_OPERATOR_SLASH:
{
if (i == 0) {
- ThrowXML(XPathException, XMLExcepts::XPath_NoForwardSlashAtStart);
+ ThrowXML(XPathException, XMLExcepts::XPath_NoForwardSlashAtStart);
}
// keep on truckin'
if (firstTokenOfLocationPath) {
- ThrowXML(XPathException, XMLExcepts::XPath_NoSelectionOfRoot);
+ ThrowXML(XPathException, XMLExcepts::XPath_NoSelectionOfRoot);
}
if (i == tokenCount - 1) {
- ThrowXML(XPathException, XMLExcepts::XPath_ExpectedStep3);
+ ThrowXML(XPathException, XMLExcepts::XPath_ExpectedStep3);
}
firstTokenOfLocationPath=false;
@@ -881,7 +886,7 @@ bool XPathScanner::scanExpression(const XMLCh* const data,
while (ch != qchar) {
if (++currentOffset == endOffset) {
return false; // REVISIT
- }
+ }
ch = data[currentOffset];
}
@@ -1008,7 +1013,7 @@ bool XPathScanner::scanExpression(const XMLCh* const data,
nameOffset = currentOffset;
currentOffset = scanNCName(data, endOffset, currentOffset);
if (currentOffset == nameOffset) {
- return false; // REVISIT
+ return false; // REVISIT
}
if (currentOffset < endOffset) {
@@ -1307,6 +1312,8 @@ void XPathScannerForSchema::addToken(ValueVectorOf<int>* const tokens,
ThrowXML(XPathException, XMLExcepts::XPath_TokenNotSupported);
}
+XERCES_CPP_NAMESPACE_END
+
/**
* End of file XercesPath.cpp
*/
diff --git a/src/xercesc/validators/schema/identity/XercesXPath.hpp b/src/xercesc/validators/schema/identity/XercesXPath.hpp
index d913391b648083297d903f759dfa125afcdd7c03..fb711f54ac92f4a877d87c3c9c3fe6984a855735 100644
--- a/src/xercesc/validators/schema/identity/XercesXPath.hpp
+++ b/src/xercesc/validators/schema/identity/XercesXPath.hpp
@@ -69,6 +69,8 @@
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/ValueVectorOf.hpp>
+XERCES_CPP_NAMESPACE_BEGIN
+
// ---------------------------------------------------------------------------
// Forward Declarations
// ---------------------------------------------------------------------------
@@ -359,7 +361,7 @@ public:
bool scanExpression(const XMLCh* const data, int currentOffset,
const int endOffset, ValueVectorOf<int>* const tokens);
-protected:
+protected:
// -----------------------------------------------------------------------
// Helper methods
// -----------------------------------------------------------------------
@@ -431,7 +433,7 @@ public:
XPathScannerForSchema(XMLStringPool* const stringPool);
~XPathScannerForSchema() {}
-protected:
+protected:
// -----------------------------------------------------------------------
// Helper methods
// -----------------------------------------------------------------------
@@ -490,6 +492,8 @@ inline RefVectorOf<XercesLocationPath>* XercesXPath::getLocationPaths() const {
return fLocationPaths;
}
+XERCES_CPP_NAMESPACE_END
+
#endif
/**