summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/CsUtil.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2010-05-25 16:57:06 -0700
committerMark Spruiell <mes@zeroc.com>2010-05-25 16:57:06 -0700
commit508924b0cfa3344e8d77979414c30ae99a6ac4f8 (patch)
tree2f710a43887116503bb990f81d9efcbc6e4db820 /cpp/src/Slice/CsUtil.cpp
parentbug 4714 - improve FreezeScript exception handling (diff)
downloadice-508924b0cfa3344e8d77979414c30ae99a6ac4f8.tar.bz2
ice-508924b0cfa3344e8d77979414c30ae99a6ac4f8.tar.xz
ice-508924b0cfa3344e8d77979414c30ae99a6ac4f8.zip
bug 4723 - Windows fix
Diffstat (limited to 'cpp/src/Slice/CsUtil.cpp')
-rw-r--r--cpp/src/Slice/CsUtil.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp
index b67c237b235..a98260e7e27 100644
--- a/cpp/src/Slice/CsUtil.cpp
+++ b/cpp/src/Slice/CsUtil.cpp
@@ -889,7 +889,12 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
{
out << nl << stream << ".write" << func << "Seq(" << param << ");";
}
- else if(isCustom || isCollection)
+ else if(isCollection)
+ {
+ out << nl << stream << ".write" << func << "Seq(" << param << " == null ? null : "
+ << param << ".ToArray());";
+ }
+ else if(isCustom)
{
if(streamingAPI)
{