diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-03-26 09:34:11 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-03-26 09:34:11 +0000 |
| commit | 8c17600ae2cfa824f9847cff679beb8126627fff (patch) | |
| tree | 684b152f8b9a633a6f05a02b125768857e4b4bf8 /cpp/src/Slice/CPlusPlusUtil.cpp | |
| parent | Temporary fix to get slice2cppe to generate the old marshal/unmarshal code. (diff) | |
| download | ice-8c17600ae2cfa824f9847cff679beb8126627fff.tar.bz2 ice-8c17600ae2cfa824f9847cff679beb8126627fff.tar.xz ice-8c17600ae2cfa824f9847cff679beb8126627fff.zip | |
Temporary fix
Diffstat (limited to 'cpp/src/Slice/CPlusPlusUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index 1de5af9b7fa..7a593a27706 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -1032,8 +1032,16 @@ Slice::writeMarshalUnmarshalCode(bool iceE, Output& out, const TypePtr& type, co if(dict) { string scope = fixKwd(dict->scope()); - out << nl << scope << "__" << func << (pointer ? "" : "&") << stream << ", " - << fixedParam << ", " << scope << "__U__" << fixKwd(dict->name()) << "());"; + if(iceE) + { + out << nl << scope << "__" << func << (pointer ? "" : "&") << stream << ", " + << fixedParam << ", " << scope << "__U__" << fixKwd(dict->name()) << "());"; + } + else + { + string funcDict = (marshal ? "write" : "read") + fixKwd(dict->name()) + "("; + out << nl << scope << "__" << funcDict << (pointer ? "" : "&") << stream << ", " << fixedParam << ");"; + } return; } |