axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nadira...@apache.org
Subject svn commit: r396748 - in /webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c: ArrayParamHeaderWriter.java ArrayParamWriter.java
Date Tue, 25 Apr 2006 00:25:47 GMT
Author: nadiramra
Date: Mon Apr 24 17:25:45 2006
New Revision: 396748

URL: http://svn.apache.org/viewcvs?rev=396748&view=rev
Log:
C support fixes/enhancements. For array of a type, do not include the type include file except
in the implementation code, since including the header file for the type would lead to 
recursive dependency, i.e. type.h included type_array.h and type_array.h include type.h. 
The type_array header file does not need to be included since it defines the type as a 
pointer to the type structure - self-defined.

Modified:
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java?rev=396748&r1=396747&r2=396748&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java
(original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java
Mon Apr 24 17:25:45 2006
@@ -66,12 +66,6 @@
             writer.write("#include <axis/Axis.h>\n");
             writer.write("#include <axis/AxisUserAPI.h>\n");
             writer.write("#include <axis/AxisUserAPIArrays.h>\n\n");
-
-            //include header file for the contained type
-            QName qname = WrapperUtils.getArrayType(type).getName();
-            if (!CUtils.isSimpleType(qname))
-                writer.write("#include \"" + attribs[0].getTypeName() + CUtils.C_HEADER_SUFFIX
+ "\"\n");
-            this.writer.write("\n");
             
             writeArrayClassDefinition();
             

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java?rev=396748&r1=396747&r2=396748&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java
(original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java
Mon Apr 24 17:25:45 2006
@@ -72,6 +72,12 @@
             // include header file for datatype
             writer.write("#include \"" + classname + ".h\"\n");
             
+            // include header file for the contained type
+            QName qname = WrapperUtils.getArrayType(type).getName();
+            if (!CUtils.isSimpleType(qname))
+                writer.write("#include \"" + attribs[0].getTypeName() + CUtils.C_HEADER_SUFFIX
+ "\"\n");
+            this.writer.write("\n");
+            
             writer.write("\n");
             writer.write("#include <axis/AxisWrapperAPI.h>\n");
             writer.write("#include <axis/IWrapperSoapSerializer.h>\n");



Mime
View raw message