ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From whitl...@apache.org
Subject cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal ClientStubWriter.java
Date Thu, 17 Mar 2005 17:14:44 GMT
whitlock    2005/03/17 09:14:44

  Modified:    c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
                        ClientStubWriter.java
               c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
                        ClientStubWriter.java
  Log:
  AXISCPP-556 Make the SimpleArrays test generated stubs compile on AIX. The generated stubs
cast an output Axis_Array to a type _Array reference like xsd_boolean_Array&. This cast
did not compile on AIX, so I replaced it with a memcpy.
  
  Revision  Changes    Path
  1.76      +2 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
  
  Index: ClientStubWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- ClientStubWriter.java	8 Mar 2005 08:41:57 -0000	1.75
  +++ ClientStubWriter.java	17 Mar 2005 17:14:44 -0000	1.76
  @@ -167,7 +167,8 @@
                           + CUtils.CPP_HEADER_SUFFIX
                           + "\"\n\n");
               }
  -            writer.write("#include <axis/AxisWrapperAPI.hpp>\n\n");
  +            writer.write("#include <axis/AxisWrapperAPI.hpp>\n");
  +		writer.write("#include <string.h>\n\n");	// for memcpy
               writer.write("using namespace std;\n\n ");
   
           }
  
  
  
  1.83      +14 -12    ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
  
  Index: ClientStubWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- ClientStubWriter.java	14 Mar 2005 14:17:31 -0000	1.82
  +++ ClientStubWriter.java	17 Mar 2005 17:14:44 -0000	1.83
  @@ -813,8 +813,11 @@
   			    containedType =
   				CUtils.getclass4qname (arrayType.
   						       getBaseType ());
  -			    writer.write ("\t\t\t" + currentParamName + " = (" + currentParaType + "&)m_pCall->getBasicArray("
+ CUtils.getXSDTypeForBasicType (containedType) + ", \"" + currentType.getParamName ()	//getElementName().getLocalPart()
  -					  + "\", 0);\n");
  +			    writer.write ("\t\t\t" + currentParamName 
  +					+ " = (" + currentParaType + "&)m_pCall->getBasicArray(" 
  +					+ CUtils.getXSDTypeForBasicType (containedType) 
  +					+ ", \"" + currentType.getParamName ()	//getElementName().getLocalPart()
  +					+ "\", 0);\n");
   			}
   			else
   			{
  @@ -943,18 +946,16 @@
   		    if (CUtils.isSimpleType (qname))
   		    {
   			containedType = CUtils.getclass4qname (qname);
  -			writer.write ("\tRetArray = (" + outparamType + "&)m_pCall->getBasicArray(" +
CUtils.getXSDTypeForBasicType (containedType) + ", \"" + returntype.getParamName ()	//getElementName().getLocalPart()
  -				      + "\", 0);\n\t\t}\n");
  +			writer.write ("\t\t\tAxis_Array RetAxisArray = m_pCall->getBasicArray(" 
  +					+ CUtils.getXSDTypeForBasicType (containedType) 
  +					+ ", \"" + returntype.getParamName () + "\", 0);\n");
   		    }
   		    else
   		    {
   			containedType = qname.getLocalPart ();
  -			writer.
  -			    write
  -			    ("\tAxis_Array arr2 = m_pCall->getCmplxArray((void*) Axis_DeSerialize_"
  -			     + containedType);
  -			//writer.write(", (void*) Axis_Create_"+containedType+", (void*) Axis_Delete_"+containedType+",
(void*) Axis_GetSize_"+containedType+", \""+returntype.getElementName().getLocalPart()+"\",
Axis_URI_"+containedType+");\n\t\t}\n");
  -			writer.write (", (void*) Axis_Create_"
  +			writer.write("\t\t\tAxis_Array RetAxisArray = m_pCall->getCmplxArray((void*) Axis_DeSerialize_"
  +					+ containedType 
  +					+ ", (void*) Axis_Create_"
   				      + containedType
   				      + ", (void*) Axis_Delete_"
   				      + containedType
  @@ -964,9 +965,10 @@
   				      + returntype.getElementNameAsString ()
   				      + "\", Axis_URI_"
   				      + containedType
  -				      + ");\n\t\t\tRetArray = ("
  -				      + outparamType + "&)arr2;\n\t\t}\n");
  +				      + ");\n");
   		    }
  +		    writer.write ("\t\t\tmemcpy(&RetArray,&RetAxisArray,sizeof(Axis_Array));\n");
  +		    writer.write ("\t\t}\n");
   		    writer.write ("\t}\n");
   		    writer.write ("\tm_pCall->unInitialize();\n");
   		    //        writer.write("\t}\n\tm_pCall->unInitialize();\n");
  
  
  

Mime
View raw message