axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From di...@apache.org
Subject svn commit: r357005 - in /webservices/axis/trunk/c: include/axis/AxisUserAPI.hpp src/common/AxisUserAPI.cpp src/common/Param.h src/engine/Axis.cpp src/soap/SoapDeSerializer.cpp src/xml/AnyElement.h
Date Thu, 15 Dec 2005 11:38:23 GMT
Author: dicka
Date: Thu Dec 15 03:38:12 2005
New Revision: 357005

URL: http://svn.apache.org/viewcvs?rev=357005&view=rev
Log:
Resolve compilation failure on unix platforms, when using the modified xsd__base64Binary object.

I have also included a couple of minor tweaks to remove outstanding compilation warnings on
Linux.

Modified:
    webservices/axis/trunk/c/include/axis/AxisUserAPI.hpp
    webservices/axis/trunk/c/src/common/AxisUserAPI.cpp
    webservices/axis/trunk/c/src/common/Param.h
    webservices/axis/trunk/c/src/engine/Axis.cpp
    webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp
    webservices/axis/trunk/c/src/xml/AnyElement.h

Modified: webservices/axis/trunk/c/include/axis/AxisUserAPI.hpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/include/axis/AxisUserAPI.hpp?rev=357005&r1=357004&r2=357005&view=diff
==============================================================================
--- webservices/axis/trunk/c/include/axis/AxisUserAPI.hpp (original)
+++ webservices/axis/trunk/c/include/axis/AxisUserAPI.hpp Thu Dec 15 03:38:12 2005
@@ -276,12 +276,12 @@
 class STORAGE_CLASS_INFO xsd__base64Binary {
 public:
     xsd__base64Binary();
-	xsd__base64Binary(xsd__base64Binary & original);
+	xsd__base64Binary(const xsd__base64Binary & original);
     ~xsd__base64Binary();
 	void set(xsd__unsignedByte * data, xsd__int size);
 	xsd__unsignedByte * get(xsd__int & size) const;
 	xsd__int getSize(void) const;
-	xsd__base64Binary & operator=(xsd__base64Binary & original);
+	xsd__base64Binary & operator=(const xsd__base64Binary & original);
 private:
     xsd__unsignedByte * __ptr;
     xsd__int __size;
@@ -294,12 +294,12 @@
 class STORAGE_CLASS_INFO xsd__hexBinary {
 public:
     xsd__hexBinary();
-    xsd__hexBinary(xsd__hexBinary & original);
+    xsd__hexBinary(const xsd__hexBinary & original);
 	~xsd__hexBinary();
     void set(xsd__unsignedByte * data, xsd__int size);
     xsd__unsignedByte * get(xsd__int & size) const;
     xsd__int getSize(void) const;
-    xsd__hexBinary & operator=(xsd__hexBinary & original);
+    xsd__hexBinary & operator=(const xsd__hexBinary & original);
 private:
     xsd__unsignedByte * __ptr;
     xsd__int __size;

Modified: webservices/axis/trunk/c/src/common/AxisUserAPI.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/common/AxisUserAPI.cpp?rev=357005&r1=357004&r2=357005&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AxisUserAPI.cpp (original)
+++ webservices/axis/trunk/c/src/common/AxisUserAPI.cpp Thu Dec 15 03:38:12 2005
@@ -42,7 +42,7 @@
   __size = 0;
 }
 
-xsd__base64Binary::xsd__base64Binary(xsd__base64Binary & original)
+xsd__base64Binary::xsd__base64Binary(const xsd__base64Binary & original)
 {
 	__ptr = NULL;
 	__size = 0;
@@ -87,7 +87,7 @@
 	return pReturn;
 }
 
-xsd__base64Binary & xsd__base64Binary::operator=(xsd__base64Binary & original)
+xsd__base64Binary & xsd__base64Binary::operator=(const xsd__base64Binary & original)
 {
 	this->set(original.__ptr, original.__size);
     return *this;
@@ -109,7 +109,7 @@
     __size = 0;
 }
 
-xsd__hexBinary::xsd__hexBinary(xsd__hexBinary & original)
+xsd__hexBinary::xsd__hexBinary(const xsd__hexBinary & original)
 {
     __ptr = NULL;
     __size = 0;
@@ -154,7 +154,7 @@
 	return pReturn;
 }
 
-xsd__hexBinary & xsd__hexBinary::operator=(xsd__hexBinary & original)
+xsd__hexBinary & xsd__hexBinary::operator=(const xsd__hexBinary & original)
 {
     this->set(original.__ptr, original.__size);
     return *this;

Modified: webservices/axis/trunk/c/src/common/Param.h
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/common/Param.h?rev=357005&r1=357004&r2=357005&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/Param.h (original)
+++ webservices/axis/trunk/c/src/common/Param.h Thu Dec 15 03:38:12 2005
@@ -63,7 +63,7 @@
     AxisString m_strPrefix; /* needed in serialization only */
     AxisString m_strUri; /* needed in serialization only */
     IAnySimpleType* m_AnySimpleType;
-    
+
 public: 
     void setValue(XSDTYPE nType, IAnySimpleType* value);
     int serialize(SoapSerializer& pSZ);

Modified: webservices/axis/trunk/c/src/engine/Axis.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/engine/Axis.cpp?rev=357005&r1=357004&r2=357005&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/Axis.cpp (original)
+++ webservices/axis/trunk/c/src/engine/Axis.cpp Thu Dec 15 03:38:12 2005
@@ -795,4 +795,5 @@
     			;
         }
     }
-}
\ No newline at end of file
+}
+

Modified: webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp?rev=357005&r1=357004&r2=357005&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp Thu Dec 15 03:38:12 2005
@@ -625,11 +625,6 @@
                 void *pCreFunct, void *pDelFunct, void *pSizeFunct,
                 const AxisChar * pName, const AxisChar * pNamespace)
 {
-    int nIndex = 0;
-    void *pItem;
-    int itemsize;
-    void** ptrval;
-
     if (AXIS_SUCCESS != m_nStatus)
     {
         return pArray;

Modified: webservices/axis/trunk/c/src/xml/AnyElement.h
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/xml/AnyElement.h?rev=357005&r1=357004&r2=357005&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/xml/AnyElement.h (original)
+++ webservices/axis/trunk/c/src/xml/AnyElement.h Thu Dec 15 03:38:12 2005
@@ -104,27 +104,32 @@
  */
 class AnyElemntUtils
 {
-	public:
-		static string toString(const AnyElement* pNode) {
-        		string sTmpVal;              			                                              
                                                                                         
         
-        		switch(pNode->m_type) {
-                		case CHARACTER_ELEMENT:
-                        		sTmpVal = string(pNode->m_pchNameOrValue);
-                        		break;
-				case END_ELEMENT:
-					//sTmpVal = "<" + pNode->m_pchNameOrValue + ;
-                                        break;
-				case START_ELEMENT:
-					//TODO.
-					break;
+    public:
+        static string toString(const AnyElement* pNode)
+        {
+            string sTmpVal;              			                                            
                                                                                         
           
+            switch(pNode->m_type)
+            {
+                case CHARACTER_ELEMENT:
+                    sTmpVal = string(pNode->m_pchNameOrValue);
+                    break;
+                case END_ELEMENT:
+                    //sTmpVal = "<" + pNode->m_pchNameOrValue + ;
+                    break;
+                case START_ELEMENT:
+                    //TODO.
+                    break;
                 case START_PREFIX:
                     break;
                 case END_PREFIX:
                     break;
-        		}
-
-			return sTmpVal;
-		}
+                case START_END_ELEMENT:
+                    break;
+                case UNKNOWN:
+                    break;
+            }
+            return sTmpVal;
+        }
 };
 
 #endif



Mime
View raw message