diff options
| author | Mark Spruiell <mes@zeroc.com> | 2012-09-27 10:16:31 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2012-09-27 10:16:31 -0700 |
| commit | ced0ab85cf66c785352333ecf72214fb069793dd (patch) | |
| tree | 16866cdab7f97dec35d0c216d83cfeb901d91ed0 /cpp/src/Slice/CsUtil.cpp | |
| parent | ICE-4859 - test/Ice/hash slice should be generated in test.Ice.hash package (diff) | |
| download | ice-ced0ab85cf66c785352333ecf72214fb069793dd.tar.bz2 ice-ced0ab85cf66c785352333ecf72214fb069793dd.tar.xz ice-ced0ab85cf66c785352333ecf72214fb069793dd.zip | |
clean up optional tests; bug fixes for Java/C#
Diffstat (limited to 'cpp/src/Slice/CsUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/CsUtil.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp index 8cccf50ddda..0c093af5e67 100644 --- a/cpp/src/Slice/CsUtil.cpp +++ b/cpp/src/Slice/CsUtil.cpp @@ -1975,7 +1975,7 @@ Slice::CsGenerator::writeOptionalSequenceMarshalUnmarshalCode(Output& out, { out << nl << stream << ".startSize();"; } - else + else if(st->minWireSize() > 1) { out << nl << stream << ".writeSize(" << param << ".Value == null ? 1 : " << length << " * " << st->minWireSize() << " + (" << length << " > 254 ? 5 : 1));"; @@ -1995,7 +1995,7 @@ Slice::CsGenerator::writeOptionalSequenceMarshalUnmarshalCode(Output& out, { out << nl << stream << ".skip(4);"; } - else + else if(st->minWireSize() > 1) { out << nl << stream << ".skipSize();"; } |