You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2002/11/20 03:23:11 UTC
cvs commit: xml-xalan/c/src/Include AIXDefinitions.hpp GCCDefinitions.hpp HPUXDefinitions.hpp IntelDefinitions.hpp OS390Definitions.hpp PlatformDefinitions.hpp STLHelper.hpp SolarisDefinitions.hpp TRU64Definitions.hpp VCPPDefinitions.hpp XalanArrayKeyMap.hpp XalanAutoPtr.hpp XalanObjectCache.hpp XalanVersion.hpp
dbertoni 2002/11/19 18:23:11
Modified: c/src/Include AIXDefinitions.hpp GCCDefinitions.hpp
HPUXDefinitions.hpp IntelDefinitions.hpp
OS390Definitions.hpp PlatformDefinitions.hpp
STLHelper.hpp SolarisDefinitions.hpp
TRU64Definitions.hpp VCPPDefinitions.hpp
XalanArrayKeyMap.hpp XalanAutoPtr.hpp
XalanObjectCache.hpp XalanVersion.hpp
Log:
Updates for new C++ namespace support.
Revision Changes Path
1.23 +3 -2 xml-xalan/c/src/Include/AIXDefinitions.hpp
Index: AIXDefinitions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/AIXDefinitions.hpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- AIXDefinitions.hpp 14 Nov 2002 23:54:34 -0000 1.22
+++ AIXDefinitions.hpp 20 Nov 2002 02:23:09 -0000 1.23
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -82,12 +82,13 @@
#define XALAN_EXPLICIT_SCOPE_IN_TEMPLATE_BUG
#define XALAN_NEW_STD_ALLOCATOR
+#define XALAN_HAS_CPP_NAMESPACE
#else
#define XALAN_OLD_STYLE_CASTS
#define XALAN_CLASSIC_IOSTREAMS
-#define XALAN_NO_NAMESPACES
+#define XALAN_NO_STD_NAMESPACE
#define XALAN_NO_MUTABLE
#define XALAN_SGI_BASED_STL
#define XALAN_NO_MEMBER_TEMPLATES
1.30 +2 -1 xml-xalan/c/src/Include/GCCDefinitions.hpp
Index: GCCDefinitions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/GCCDefinitions.hpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- GCCDefinitions.hpp 14 Nov 2002 23:54:34 -0000 1.29
+++ GCCDefinitions.hpp 20 Nov 2002 02:23:09 -0000 1.30
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -85,6 +85,7 @@
#define XALAN_XALANDOMCHAR_USHORT_MISMATCH
#define XALAN_POSIX2_AVAILABLE
#define XALAN_INLINE_INITIALIZATION
+#define XALAN_HAS_CPP_NAMESPACE
#define XALAN_UNALIGNED
1.18 +2 -1 xml-xalan/c/src/Include/HPUXDefinitions.hpp
Index: HPUXDefinitions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/HPUXDefinitions.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- HPUXDefinitions.hpp 14 Nov 2002 23:54:34 -0000 1.17
+++ HPUXDefinitions.hpp 20 Nov 2002 02:23:09 -0000 1.18
@@ -77,13 +77,14 @@
#if defined(RWSTD_MULTI_THREAD) && !defined(__HPACC_THREAD_SAFE_RB_TREE)
#define __HPACC_THREAD_SAFE_RB_TREE
#endif
+#define XALAN_NO_STD_NAMESPACE
#define XALAN_CLASSIC_IOSTREAMS
-#define XALAN_NO_NAMESPACES
#define XALAN_NO_STD_ALLOCATORS
#define XALAN_SGI_BASED_STL
#define XALAN_NO_STD_NUMERIC_LIMITS
#endif
+#define XALAN_HAS_CPP_NAMESPACE
#define XALAN_XALANDOMCHAR_USHORT_MISMATCH
#define XALAN_POSIX2_AVAILABLE
#define XALAN_INLINE_INITIALIZATION
1.3 +3 -0 xml-xalan/c/src/Include/IntelDefinitions.hpp
Index: IntelDefinitions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/IntelDefinitions.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IntelDefinitions.hpp 21 Sep 2002 01:21:46 -0000 1.2
+++ IntelDefinitions.hpp 20 Nov 2002 02:23:09 -0000 1.3
@@ -72,6 +72,7 @@
+#define XALAN_HAS_CPP_NAMESPACE
#define XALAN_USE_DEQUE_FOR_VECTOR_BOOL
#define XALAN_XALANDOMCHAR_USHORT_MISMATCH
#define XALAN_POSIX2_AVAILABLE
@@ -79,5 +80,7 @@
#define XALAN_USE_XERCES_LOCAL_CODEPAGE_TRANSCODERS
#define XALAN_UNALIGNED
+
+
#endif // INTELDEFINITIONS_HEADER_GUARD_1357924680
1.12 +2 -1 xml-xalan/c/src/Include/OS390Definitions.hpp
Index: OS390Definitions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/OS390Definitions.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- OS390Definitions.hpp 14 Nov 2002 23:54:34 -0000 1.11
+++ OS390Definitions.hpp 20 Nov 2002 02:23:09 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,6 +76,7 @@
#define XALAN_OLD_STYLE_CASTS
#define XALAN_NO_NAMESPACES
+#define XALAN_NO_STD_NAMESPACE
#define XALAN_NO_MUTABLE
#define XALAN_SGI_BASED_STL
#define XALAN_NO_MEMBER_TEMPLATES
1.13 +61 -0 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PlatformDefinitions.hpp 7 Aug 2002 05:01:37 -0000 1.12
+++ PlatformDefinitions.hpp 20 Nov 2002 02:23:09 -0000 1.13
@@ -79,4 +79,65 @@
#include "XalanVersion.hpp"
+#if defined(__cplusplus)
+
+// ---------------------------------------------------------------------------
+// Define namespace symbols if the compiler supports it.
+// ---------------------------------------------------------------------------
+#if defined(XALAN_HAS_CPP_NAMESPACE)
+ #define XALAN_CPP_NAMESPACE_BEGIN namespace XALAN_CPP_NAMESPACE {
+ #define XALAN_CPP_NAMESPACE_END }
+ #define XALAN_CPP_NAMESPACE_USE using namespace XALAN_CPP_NAMESPACE;
+ #define XALAN_CPP_NAMESPACE_QUALIFIER XALAN_CPP_NAMESPACE::
+ #define XALAN_USING(NAMESPACE,NAME) using NAMESPACE :: NAME;
+ #define XALAN_DECLARE_CLASS(NAMESPACE,NAME) namespace NAMESPACE { class NAME; }
+ #define XALAN_DECLARE_STRUCT(NAMESPACE,NAME) namespace NAMESPACE { struct NAME; }
+
+ namespace XALAN_CPP_NAMESPACE { }
+ namespace xalanc = XALAN_CPP_NAMESPACE;
+#else
+ #define XALAN_CPP_NAMESPACE_BEGIN
+ #define XALAN_CPP_NAMESPACE_END
+ #define XALAN_CPP_NAMESPACE_USE
+ #define XALAN_CPP_NAMESPACE_QUALIFIER
+ #define XALAN_USING(NAMESPACE,NAME)
+ #define XALAN_DECLARE_CLASS(NAMESPACE,NAME) class NAME;
+ #define XALAN_DECLARE_STRUCT(NAMESPACE,NAME) struct NAME;
+ #if !defined(XALAN_NO_STD_NAMESPACE)
+ #define XALAN_NO_STD_NAMESPACE
+ #endif
+#endif
+
+
+#if defined(XALAN_NO_STD_NAMESPACE)
+ #define XALAN_USING_STD(NAME)
+ #define XALAN_STD_QUALIFIER
+#else
+ #define XALAN_USING_STD(NAME) using std :: NAME;
+ #define XALAN_STD_QUALIFIER std ::
+#endif
+
+#define XALAN_DECLARE_XALAN_CLASS(NAME) class XALAN_CPP_NAMESPACE_QUALIFIER NAME;
+#define XALAN_DECLARE_XALAN_STRUCT(NAME) struct XALAN_CPP_NAMESPACE_QUALIFIER NAME;
+#define XALAN_USING_XALAN(NAME) XALAN_USING(xalanc, NAME);
+#define XALAN_USING_XERCES(NAME) XALAN_USING(xercesc, NAME)
+
+
+
+// Yuck!!!! Have to include this here because there's no way to handle
+// the new namespace macros without it!
+#include "xercesc/util/XercesDefs.hpp"
+
+#if _XERCES_VERSION < 20200
+ #define XERCES_CPP_NAMESPACE_QUALIFIER
+#endif
+
+
+#define XALAN_DECLARE_XERCES_CLASS(NAME) XALAN_DECLARE_CLASS(xercesc, NAME)
+#define XALAN_DECLARE_XERCES_STRUCT(NAME) XALAN_DECLARE_STRUCT(xercesc, NAME)
+
+#endif // __cplusplus
+
+
+
#endif // PLATFORMDEFINITIONS_HEADER_GUARD_1357924680
1.7 +9 -1 xml-xalan/c/src/Include/STLHelper.hpp
Index: STLHelper.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/STLHelper.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- STLHelper.hpp 31 Oct 2002 07:09:04 -0000 1.6
+++ STLHelper.hpp 20 Nov 2002 02:23:09 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* Functor to delete objects, used in STL iteration algorithms.
*/
@@ -502,6 +506,10 @@
return less<T>()(*theLHS, *theRHS);
}
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.19 +2 -1 xml-xalan/c/src/Include/SolarisDefinitions.hpp
Index: SolarisDefinitions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/SolarisDefinitions.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SolarisDefinitions.hpp 14 Nov 2002 23:54:34 -0000 1.18
+++ SolarisDefinitions.hpp 20 Nov 2002 02:23:09 -0000 1.19
@@ -73,6 +73,7 @@
#if __SUNPRO_CC >= 0x520
+#define XALAN_HAS_CPP_NAMESPACE
#define XALAN_STRICT_ANSI_HEADERS
#else
@@ -81,10 +82,10 @@
// broken with extra cv-qualifiers, so we'll use old-style casts.
#define XALAN_OLD_STYLE_CASTS
+#define XALAN_NO_STD_NAMESPACE
#define XALAN_STLPORT_STL
#define XALAN_NO_DEFAULT_BUILTIN_ARRAY_INITIALIZATION
#define XALAN_CLASSIC_IOSTREAMS
-#define XALAN_NO_NAMESPACES
#define XALAN_NO_MUTABLE
#define XALAN_SGI_BASED_STL
#define XALAN_NO_MEMBER_TEMPLATES
1.13 +1 -0 xml-xalan/c/src/Include/TRU64Definitions.hpp
Index: TRU64Definitions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/TRU64Definitions.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TRU64Definitions.hpp 14 Nov 2002 17:23:32 -0000 1.12
+++ TRU64Definitions.hpp 20 Nov 2002 02:23:09 -0000 1.13
@@ -74,6 +74,7 @@
// This next line enables standard IO streams.
#define __USE_STD_IOSTREAM
+#define XALAN_HAS_CPP_NAMESPACE
#define XALAN_XALANDOMCHAR_USHORT_MISMATCH
#define XALAN_POSIX2_AVAILABLE
#define XALAN_INLINE_INITIALIZATION
1.22 +1 -0 xml-xalan/c/src/Include/VCPPDefinitions.hpp
Index: VCPPDefinitions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/VCPPDefinitions.hpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- VCPPDefinitions.hpp 21 Sep 2002 01:21:46 -0000 1.21
+++ VCPPDefinitions.hpp 20 Nov 2002 02:23:09 -0000 1.22
@@ -85,6 +85,7 @@
#define XALAN_LSTRSUPPORT
#define XALAN_NEWLINE_IS_CRLF
+#define XALAN_HAS_CPP_NAMESPACE
#define XALAN_UNALIGNED
1.6 +8 -0 xml-xalan/c/src/Include/XalanArrayKeyMap.hpp
Index: XalanArrayKeyMap.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/XalanArrayKeyMap.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanArrayKeyMap.hpp 4 Mar 2001 19:40:27 -0000 1.5
+++ XalanArrayKeyMap.hpp 20 Nov 2002 02:23:10 -0000 1.6
@@ -65,6 +65,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
template<class KeyType, class ValueType, class CompareType>
class XalanArrayKeyMap
{
@@ -363,6 +367,10 @@
VectorHolderType m_keyData;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +9 -1 xml-xalan/c/src/Include/XalanAutoPtr.hpp
Index: XalanAutoPtr.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/XalanAutoPtr.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanAutoPtr.hpp 14 Nov 2002 17:23:32 -0000 1.6
+++ XalanAutoPtr.hpp 20 Nov 2002 02:23:10 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// We're using our own auto_ptr-like class due to wide
// variations amongst the varous platforms we have to
// support
@@ -255,6 +259,10 @@
Type* m_pointer;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +9 -1 xml-xalan/c/src/Include/XalanObjectCache.hpp
Index: XalanObjectCache.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/XalanObjectCache.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanObjectCache.hpp 22 Jul 2002 22:25:01 -0000 1.6
+++ XalanObjectCache.hpp 20 Nov 2002 02:23:10 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
template<class ObjectType>
class DefaultCacheCreateFunctor
{
@@ -426,6 +430,10 @@
{
}
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -1 xml-xalan/c/src/Include/XalanVersion.hpp
Index: XalanVersion.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Include/XalanVersion.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanVersion.hpp 21 Oct 2002 23:26:22 -0000 1.3
+++ XalanVersion.hpp 20 Nov 2002 02:23:10 -0000 1.4
@@ -193,7 +193,9 @@
#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
+#define INVK_CAT3_RAW_NUMERIC_SEP_UNDERSCORE(a,b,c) CAT3_RAW_NUMERIC_SEP_UNDERSCORE(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)
@@ -216,6 +218,11 @@
#define XALAN_FULLVERSIONDOT INVK_CAT3_SEP_PERIOD(XALAN_VERSION_MAJOR,XALAN_VERSION_MINOR,XALAN_VERSION_REVISION)
#define XALAN_FULLVERSIONNUM INVK_CAT3_SEP_NIL(XALAN_VERSION_MAJOR,XALAN_VERSION_MINOR,XALAN_VERSION_REVISION)
#define XALAN_VERSIONSTR INVK_CAT2_SEP_UNDERSCORE(XALAN_VERSION_MAJOR,XALAN_VERSION_MINOR)
+
+// Xalan C++ Namespace string, concatenated with full version string
+#define XALAN_PRODUCT xalanc
+#define XALAN_CPP_NAMESPACE INVK_CAT3_RAW_NUMERIC_SEP_UNDERSCORE(XALAN_PRODUCT,XALAN_VERSION_MAJOR,XALAN_VERSION_MINOR)
+
// original from Xalan header
#define Xalan_DLLVersionStr XALAN_FULLVERSIONSTR
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org