From 524c6efc4149e64c318fb8b5174816b5b7b7345c Mon Sep 17 00:00:00 2001 From: Michi Henning Date: Wed, 19 Mar 2003 09:44:58 +0000 Subject: The following Slice file generated incorrect code: class X; class Y { X myX; }; Fixed the marshaling side (__write() and __marshal()) for this, but the reading side (__read() and __unmarshal()) are still broken. --- cpp/src/Slice/CPlusPlusUtil.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'cpp/src/Slice/CPlusPlusUtil.cpp') 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 { -- cgit v1.2.3