You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2004/09/08 12:58:40 UTC
cvs commit: ws-axis/c/include/axis/server TypeMapping.h
damitha 2004/09/08 03:58:39
Modified: c/src/common TypeMapping.cpp
c/include/axis/server TypeMapping.h
Log:
Applying the patches sent by Valentine to support Solaris.
Thanks Valentine
Revision Changes Path
1.17 +4 -4 ws-axis/c/src/common/TypeMapping.cpp
Index: TypeMapping.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/TypeMapping.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TypeMapping.cpp 6 Aug 2004 14:44:29 -0000 1.16
+++ TypeMapping.cpp 8 Sep 2004 10:58:39 -0000 1.17
@@ -27,11 +27,11 @@
AXIS_CPP_NAMESPACE_START
using namespace std;
-#if !defined( AIX ) && !defined( __OS400__ )
-std::map < const std::AxisXMLString, XSDTYPE >
+#if (defined(AIX) || defined( __OS400__ ) || (defined(_MSC_VER) && _MSC_VER >= 1300) || defined(__sun))
+ std::map < AxisXMLString, XSDTYPE >
AXIS_CPP_NAMESPACE_PREFIX TypeMapping::m_sTypeMap;
#else
-std::map < std::AxisXMLString, XSDTYPE >
+ std::map < const AxisXMLString, XSDTYPE >
AXIS_CPP_NAMESPACE_PREFIX TypeMapping::m_sTypeMap;
#endif
volatile bool TypeMapping::m_bInit = false;
@@ -90,4 +90,4 @@
return XSD_UNKNOWN;
}
-AXIS_CPP_NAMESPACE_END
\ No newline at end of file
+AXIS_CPP_NAMESPACE_END
1.16 +1 -1 ws-axis/c/include/axis/server/TypeMapping.h
Index: TypeMapping.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/server/TypeMapping.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TypeMapping.h 6 Aug 2004 14:44:21 -0000 1.15
+++ TypeMapping.h 8 Sep 2004 10:58:39 -0000 1.16
@@ -61,7 +61,7 @@
static XSDTYPE map(const AxisXMLCh* sType);
static void initialize();
-#if (defined(AIX) || (defined(_MSC_VER) && _MSC_VER >= 1300) || defined( __OS400__ ))
+#if (defined(AIX) || (defined(_MSC_VER) && _MSC_VER >= 1300) || defined( __OS400__ ) || defined(__sun))
static std::map<std::AxisXMLString, XSDTYPE> m_sTypeMap;
#else
static std::map<const std::AxisXMLString, XSDTYPE> m_sTypeMap;