rpms/ice/F-8 541d1194844106-1-attachment-s-patch-5-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch5.txt, NONE, 1.1

Mary Ellen Foster (mef) fedora-extras-commits at redhat.com
Thu Nov 29 11:12:29 UTC 2007


Author: mef

Update of /cvs/pkgs/rpms/ice/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17232/F-8

Added Files:
	541d1194844106-1-attachment-s-patch-5-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch5.txt 
Log Message:
Added latest patch to branches


--- NEW FILE 541d1194844106-1-attachment-s-patch-5-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch5.txt ---
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp
index 0f4ff68..f96205a 100755
--- a/cpp/src/Slice/CsUtil.cpp
+++ b/cpp/src/Slice/CsUtil.cpp
@@ -808,13 +808,14 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
             out << nl << stream << ".writeSize(" << param << '.' << limitID << ");";
             out << nl << "for(int ix__ = 0; ix__ < " << param << '.' << limitID << "; ++ix__)";
             out << sb;
-            if(streamingAPI)
+            if(!isValueType(type))
             {
-                out << nl << param << "[ix__].ice_write(" << stream << ");";
+                out << nl << "(" << param << "[ix__] == null ? new " << typeS << "() : "
+                    << param << "[ix__])." << (streamingAPI ? "ice_write" : "write__") << "(" << stream << ");";
             }
             else
             {
-                out << nl << param << "[ix__].write__(" << stream << ");";
+                out << nl << param << "[ix__]." << (streamingAPI ? "ice_write" : "write__") << "(" << stream << ");";
             }
             out << eb;
             out << eb;




More information about the fedora-extras-commits mailing list