diff options
| author | Michi Henning <michi@zeroc.com> | 2007-11-09 11:23:29 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2007-11-09 11:23:29 +1000 |
| commit | 5907b131a99aab05487c0c9396e118bc49fb9cd9 (patch) | |
| tree | c0879a724752d1fa4c743bb6fda3f80c64cd17c8 /cpp/src/Slice/CsUtil.cpp | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| parent | - Adding root makefile for Windows and UNIX. (diff) | |
| download | ice-5907b131a99aab05487c0c9396e118bc49fb9cd9.tar.bz2 ice-5907b131a99aab05487c0c9396e118bc49fb9cd9.tar.xz ice-5907b131a99aab05487c0c9396e118bc49fb9cd9.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/Slice/CsUtil.cpp')
| -rwxr-xr-x | cpp/src/Slice/CsUtil.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp index 4290a7a1b8b..ae9ed24bc11 100755 --- a/cpp/src/Slice/CsUtil.cpp +++ b/cpp/src/Slice/CsUtil.cpp @@ -416,7 +416,7 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out, if(isOutParam) { out << nl << "IceInternal.ParamPatcher<Ice.Object> " << param - << "_PP = new IceInternal.ParamPatcher<Ice.Object>();"; + << "_PP = new IceInternal.ParamPatcher<Ice.Object>(\"::Ice::Object\");"; out << nl << stream << ".readObject("; if(streamingAPI) { @@ -431,7 +431,7 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out, { out << "(Ice.ReadObjectCallback)"; } - out << "new Patcher__(" << patchParams << "));"; + out << "new Patcher__(\"::Ice::Object\", " << patchParams << "));"; } } break; @@ -494,9 +494,9 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out, { if(isOutParam) { - ContainedPtr contained = ContainedPtr::dynamicCast(type); out << nl << "IceInternal.ParamPatcher<" << typeToString(type) << ">" << param - << "_PP = new IceInternal.ParamPatcher<" << typeToString(type) << ">();"; + << "_PP = new IceInternal.ParamPatcher<" << typeToString(type) << ">(\"" + << cl->scoped() << "\");"; out << nl << stream << ".readObject("; if(streamingAPI) { @@ -511,7 +511,7 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out, { out << "(Ice.ReadObjectCallback)"; } - out << "new Patcher__(" << patchParams << "));"; + out << "new Patcher__(\"" << cl->scoped() << "\", " << patchParams << "));"; } } return; @@ -802,7 +802,8 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out, { patcherName = "Sequence"; } - out << "new IceInternal." << patcherName << "Patcher<Ice.Object>(" << param << ", ix__));"; + out << "new IceInternal." << patcherName << "Patcher<Ice.Object>(\"::Ice::Object\", " + << param << ", ix__));"; } else { @@ -994,8 +995,9 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out, { patcherName = "Sequence"; } + string scoped = ContainedPtr::dynamicCast(type)->scoped(); out << nl << "IceInternal." << patcherName << "Patcher<" << typeS << "> spx = new IceInternal." - << patcherName << "Patcher<" << typeS << ">(" << param << ", ix__);"; + << patcherName << "Patcher<" << typeS << ">(\"" << scoped << "\", " << param << ", ix__);"; out << nl << stream << ".readObject("; if(streamingAPI) { |