dbertoni 2002/11/25 17:45:28
Modified: c/src/Include PlatformDefinitions.hpp
Log:
Fixed macros for non-namespace aware builds.
Revision Changes Path
1.18 +9 -4 xml-xalan/c/src/Include/PlatformDefinitions.hpp
Index: PlatformDefinitions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/PlatformDefinitions.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- PlatformDefinitions.hpp 21 Nov 2002 01:59:23 -0000 1.17
+++ PlatformDefinitions.hpp 26 Nov 2002 01:45:28 -0000 1.18
@@ -127,16 +127,21 @@
// the new namespace macros without it!
#include "xercesc/util/XercesDefs.hpp"
-#if _XERCES_VERSION < 20200
+#if defined(XERCES_HAS_CPP_NAMESPACE)
+ #define XALAN_USING_XERCES(NAME) XALAN_USING(XERCES_CPP_NAMESPACE, NAME)
+ #define XALAN_DECLARE_XERCES_CLASS(NAME)
XALAN_DECLARE_CLASS(XERCES_CPP_NAMESPACE, NAME)
+ #define XALAN_DECLARE_XERCES_STRUCT(NAME)
XALAN_DECLARE_STRUCT(XERCES_CPP_NAMESPACE, NAME)
+#else
#define XERCES_CPP_NAMESPACE_QUALIFIER
#define XERCES_CPP_NAMESPACE_BEGIN
#define XERCES_CPP_NAMESPACE_END
+ #define XERCES_CPP_NAMESPACE_USE
+ #define XALAN_USING_XERCES(NAME)
+ #define XALAN_DECLARE_XERCES_CLASS(NAME) class NAME;
+ #define XALAN_DECLARE_XERCES_STRUCT(NAME) struct NAME;
#endif
-#define XALAN_USING_XERCES(NAME) XALAN_USING(XERCES_CPP_NAMESPACE, NAME)
-#define XALAN_DECLARE_XERCES_CLASS(NAME)
XALAN_DECLARE_CLASS(XERCES_CPP_NAMESPACE, NAME)
-#define XALAN_DECLARE_XERCES_STRUCT(NAME)
XALAN_DECLARE_STRUCT(XERCES_CPP_NAMESPACE, NAME)
#endif // __cplusplus
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
