diff options
Diffstat (limited to 'cpp/src/Slice/CPlusPlusUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index c66611d4ab9..f0d77d96fe1 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -424,8 +424,8 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string& out << sb; if(marshal) { - out << nl << "::Ice::ObjectPtr " << obj << " = " << fixedParam << ';'; - out << nl << stream << deref << func << obj << ");"; + string scope = fixKwd(cl->scope()); + out << nl << scope << "__write(" << stream << ", " << fixedParam << ");"; } else { @@ -643,8 +643,9 @@ Slice::writeGenericMarshalUnmarshalCode(Output& out, const TypePtr& type, const out << sb; if(marshal) { - out << nl << "::Ice::ObjectPtr " << obj << " = " << fixedParam << ';'; - out << nl << stream << deref << streamFunc << "Object(" << tagName << ", " << obj << ");"; + string scope = fixKwd(cl->scope()); + out << nl << scope << "__" << streamFunc << "Object(" << stream << ", " << tagName << ", " + << fixedParam << ");"; } else { |