diff options
| author | Michi Henning <michi@zeroc.com> | 2007-10-16 16:01:26 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2007-10-16 16:01:26 +1000 |
| commit | 180777b00ce6ea6e46d6b14ba66711efec2232d1 (patch) | |
| tree | 76bb29a1ddd6e985245974c9f10853705ff7f89e /cpp/src/Slice/CsUtil.cpp | |
| parent | Fixed bug #702 (diff) | |
| download | ice-180777b00ce6ea6e46d6b14ba66711efec2232d1.tar.bz2 ice-180777b00ce6ea6e46d6b14ba66711efec2232d1.tar.xz ice-180777b00ce6ea6e46d6b14ba66711efec2232d1.zip | |
Finished implementation of custom sequence mapping.
Changed patcher classes to template classes.
Diffstat (limited to 'cpp/src/Slice/CsUtil.cpp')
| -rwxr-xr-x | cpp/src/Slice/CsUtil.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp index 643670836e4..4290a7a1b8b 100755 --- a/cpp/src/Slice/CsUtil.cpp +++ b/cpp/src/Slice/CsUtil.cpp @@ -415,8 +415,8 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out, { if(isOutParam) { - out << nl << "IceInternal.ParamPatcher " << param - << "_PP = new IceInternal.ParamPatcher(typeof(Ice.Object), \"::Ice::Object\");"; + out << nl << "IceInternal.ParamPatcher<Ice.Object> " << param + << "_PP = new IceInternal.ParamPatcher<Ice.Object>();"; out << nl << stream << ".readObject("; if(streamingAPI) { @@ -495,8 +495,8 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out, if(isOutParam) { ContainedPtr contained = ContainedPtr::dynamicCast(type); - out << nl << "IceInternal.ParamPatcher " << param - << "_PP = new IceInternal.ParamPatcher(typeof(" << typeToString(type) << "), \"" << contained->scoped() << "\");"; + out << nl << "IceInternal.ParamPatcher<" << typeToString(type) << ">" << param + << "_PP = new IceInternal.ParamPatcher<" << typeToString(type) << ">();"; out << nl << stream << ".readObject("; if(streamingAPI) { @@ -802,8 +802,7 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out, { patcherName = "Sequence"; } - out << "new IceInternal." << patcherName << "Patcher<" << typeS << ">(" - << param << ", typeof(Ice.Object), ix__));"; + out << "new IceInternal." << patcherName << "Patcher<Ice.Object>(" << param << ", ix__));"; } else { @@ -996,7 +995,7 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out, patcherName = "Sequence"; } out << nl << "IceInternal." << patcherName << "Patcher<" << typeS << "> spx = new IceInternal." - << patcherName << "Patcher<" << typeS << ">(" << param << ", " << "typeof(" << typeS << "), ix__);"; + << patcherName << "Patcher<" << typeS << ">(" << param << ", ix__);"; out << nl << stream << ".readObject("; if(streamingAPI) { |