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 wh...@apache.org on 2005/08/04 17:59:58 UTC
cvs commit: ws-axis/c/src/platforms/unix PlatformSpecificUnix.hpp
whitlock 2005/08/04 08:59:58
Modified: c/src/common AxisTrace.cpp AxisTrace.h
c/src/engine HandlerChain.h
c/src/platforms/unix PlatformSpecificUnix.hpp
Log:
Make Axis C++ work on Solaris
Fix warnings in trace about passing a string literal as a char*
In PlatformSpecificUnix.hpp #include <pthread.h>
In HandlerChain.h in ChainItem, declare operator methods needed by std::list.
Revision Changes Path
1.64 +3 -3 ws-axis/c/src/common/AxisTrace.cpp
Index: AxisTrace.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisTrace.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- AxisTrace.cpp 27 Jun 2005 13:51:52 -0000 1.63
+++ AxisTrace.cpp 4 Aug 2005 15:59:57 -0000 1.64
@@ -141,7 +141,7 @@
}
int AxisTrace::logaxis (const char* sLog1, const char* sLog2, const char *type,
- char* file, int line)
+ const char* file, int line)
{
if (isTraceOn()) return AXIS_FAIL;
@@ -185,7 +185,7 @@
text += ctime (<ime);
traceLine2(text.c_str());
- char *envVars[]={"PATH","LIBPATH","LD_LIBRARY_PATH","AXISCPP_DEPLOY","PWD",
+ const char *envVars[]={"PATH","LIBPATH","LD_LIBRARY_PATH","AXISCPP_DEPLOY","PWD",
"CLASSPATH","INCLUDE","LIB","NLSPATH","OS","COMPUTERNAME","USERNAME",
"HOSTNAME","LANG","LOGIN","LOGNAME","MACHTYPE","OSTYPE","UID","USER"};
for (unsigned i=0; i<(sizeof(envVars)/sizeof(char*)); i++)
@@ -207,7 +207,7 @@
traceLine("-------------- Config File settings START ----------------");
string confLine="";
- char *confProps[]={
+ const char *confProps[]={
"AXCONF_WSDDFILEPATH", //1
"AXCONF_LOGPATH", //2
"AXCONF_CLIENTLOGPATH", //3
1.40 +1 -1 ws-axis/c/src/common/AxisTrace.h
Index: AxisTrace.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisTrace.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- AxisTrace.h 11 Jul 2005 10:24:38 -0000 1.39
+++ AxisTrace.h 4 Aug 2005 15:59:57 -0000 1.40
@@ -153,7 +153,7 @@
* (AXIS_SUCCESS) or not * (AXIS_FAIL).
*/
static int logaxis(const char* sLog1, const char* sLog2,
- const char *type, char* file, int line);
+ const char *type, const char* file, int line);
/**
* Writes the given string to the standard console.
1.12 +9 -0 ws-axis/c/src/engine/HandlerChain.h
Index: HandlerChain.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/HandlerChain.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HandlerChain.h 23 Nov 2004 17:21:03 -0000 1.11
+++ HandlerChain.h 4 Aug 2005 15:59:57 -0000 1.12
@@ -37,6 +37,15 @@
BasicHandler* m_pHandler;
int m_nScope;
int m_nLibId;
+
+ bool operator==(const ChainItem& other) const {
+ return (*this) == other;
+ }
+
+ bool operator<(const ChainItem& other) const {
+ return (*this) < other;
+ }
+
} ChainItem;
public:
int addHandler(BasicHandler* pHandler, int nScope, int nLibId);
1.23 +1 -0 ws-axis/c/src/platforms/unix/PlatformSpecificUnix.hpp
Index: PlatformSpecificUnix.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/platforms/unix/PlatformSpecificUnix.hpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- PlatformSpecificUnix.hpp 4 Jul 2005 16:43:58 -0000 1.22
+++ PlatformSpecificUnix.hpp 4 Aug 2005 15:59:57 -0000 1.23
@@ -100,6 +100,7 @@
/**
* Platform specific method to obtain current thread ID
*/
+#include <pthread.h>
#define PLATFORM_GET_THREAD_ID pthread_self()
/**