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 2001/12/07 22:36:10 UTC
cvs commit: xml-xalan/c/src/Include SolarisDefinitions.hpp
dbertoni 01/12/07 13:36:10
Modified: c/src/Include SolarisDefinitions.hpp
Log:
Fixes for newer Sun Workshop compilers.
Revision Changes Path
1.6 +16 -8 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SolarisDefinitions.hpp 2001/11/27 01:15:47 1.5
+++ SolarisDefinitions.hpp 2001/12/07 21:36:10 1.6
@@ -84,28 +84,36 @@
+#if __SUNPRO_CC_COMPAT >= 5
+
+#define XALAN_SIZE_T_IN_NAMESPACE_STD
+
+#else
+
+#define XALAN_STLPORT_STL
+#define XALAN_NO_DEFAULT_BUILTIN_ARRAY_INITIALIZATION
#define XALAN_OLD_STREAMS
#define XALAN_NO_NAMESPACES
#define XALAN_NO_MUTABLE
#define XALAN_SGI_BASED_STL
#define XALAN_NO_MEMBER_TEMPLATES
-#define XALAN_CANNOT_DELETE_CONST
+//#define XALAN_CANNOT_DELETE_CONST
#define XALAN_BOOL_AS_INT
#define XALAN_NO_DEFAULT_TEMPLATE_ARGUMENTS
#define XALAN_NO_COVARIANT_RETURN_TYPE
+
+// STL Port Definitions
+#define __STL_NO_SGI_IOSTREAMS
+#include <stl/_config.h>
+
+#endif
+
#define XALAN_XALANDOMCHAR_USHORT_MISMATCH
#define XALAN_BIG_ENDIAN
-#define XALAN_STLPORT_STL
-#define XALAN_NO_DEFAULT_BUILTIN_ARRAY_INITIALIZATION
#define XALAN_POSIX2_AVAILABLE
#define XALAN_UNALIGNED
-#if __SUNPRO_CC_COMPAT < 5
-// STL Port Definitions
-#define __STL_NO_SGI_IOSTREAMS
-#include <stl/_config.h>
-#endif
#endif // SOLARISDEFINITIONS_HEADER_GUARD_1357924680
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org