diff options
author | Bernard Normier <bernard@zeroc.com> | 2016-11-17 18:05:33 -0500 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2016-11-17 18:05:33 -0500 |
commit | f0c21cb5f22a369e6f2b22b730801c40acae8de0 (patch) | |
tree | daae93cce2ef67aa84432641de7bf5694046143a /cpp/src/slice2cs/CsUtil.cpp | |
parent | Replaced double-underscores in java and java-compat (diff) | |
download | ice-f0c21cb5f22a369e6f2b22b730801c40acae8de0.tar.bz2 ice-f0c21cb5f22a369e6f2b22b730801c40acae8de0.tar.xz ice-f0c21cb5f22a369e6f2b22b730801c40acae8de0.zip |
Resync stream API for generated structs/enums in Java and C#
Diffstat (limited to 'cpp/src/slice2cs/CsUtil.cpp')
-rw-r--r-- | cpp/src/slice2cs/CsUtil.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp index a9ac2f94042..af0e5305b70 100644 --- a/cpp/src/slice2cs/CsUtil.cpp +++ b/cpp/src/slice2cs/CsUtil.cpp @@ -688,22 +688,22 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out, { if(!isValueType(st)) { - out << nl << typeToString(st) << ".write(" << stream << ", " << param << ");"; + out << nl << typeToString(st) << ".ice_write(" << stream << ", " << param << ");"; } else { - out << nl << param << ".iceWrite(" << stream << ");"; + out << nl << param << ".ice_writeMembers(" << stream << ");"; } } else { if(!isValueType(st)) { - out << nl << param << " = " << typeToString(type) << ".read(" << stream << ");"; + out << nl << param << " = " << typeToString(type) << ".ice_read(" << stream << ");"; } else { - out << nl << param << ".iceRead(" << stream << ");"; + out << nl << param << ".ice_readMembers(" << stream << ");"; } } return; @@ -1542,7 +1542,7 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out, } } call += "."; - call += "iceWrite"; + call += "ice_writeMembers"; call += "(" + stream + ");"; out << nl << call; out << eb; @@ -1587,12 +1587,12 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out, { out << nl << v << "[ix] = new " << typeS << "();"; } - out << nl << v << "[ix].iceRead(" << stream << ");"; + out << nl << v << "[ix].ice_readMembers(" << stream << ");"; } else { out << nl << typeS << " val = new " << typeS << "();"; - out << nl << "val.iceRead(" << stream << ");"; + out << nl << "val.ice_readMembers(" << stream << ");"; out << nl << param << "." << addMethod << "(val);"; } out << eb; |