tng 2002/11/04 06:42:15
Modified: c/src/xercesc/util XercesVersion.hpp
Log:
C++ Namespace Support.
Revision Changes Path
1.4 +7 -1 xml-xerces/c/src/xercesc/util/XercesVersion.hpp
Index: XercesVersion.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XercesVersion.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesVersion.hpp 8 Aug 2002 19:33:28 -0000 1.3
+++ XercesVersion.hpp 4 Nov 2002 14:42:15 -0000 1.4
@@ -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
@@ -216,6 +218,10 @@
#define XERCES_FULLVERSIONDOT
INVK_CAT3_SEP_PERIOD(XERCES_VERSION_MAJOR,XERCES_VERSION_MINOR,XERCES_VERSION_REVISION)
#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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
