diff options
| author | Michi Henning <michi@zeroc.com> | 2004-09-14 05:31:22 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2004-09-14 05:31:22 +0000 |
| commit | d0739935c21fb3249776e7812e4bfc804963e84e (patch) | |
| tree | 14f3d40ebcb8532e0cc6c83f07c65c8feb04c63f /cpp/src/Slice/VbUtil.cpp | |
| parent | Fixed incorrect cast in generated code. (diff) | |
| download | ice-d0739935c21fb3249776e7812e4bfc804963e84e.tar.bz2 ice-d0739935c21fb3249776e7812e4bfc804963e84e.tar.xz ice-d0739935c21fb3249776e7812e4bfc804963e84e.zip | |
*** empty log message ***
Diffstat (limited to 'cpp/src/Slice/VbUtil.cpp')
| -rwxr-xr-x | cpp/src/Slice/VbUtil.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/cpp/src/Slice/VbUtil.cpp b/cpp/src/Slice/VbUtil.cpp index b064652d581..75681aa38d7 100755 --- a/cpp/src/Slice/VbUtil.cpp +++ b/cpp/src/Slice/VbUtil.cpp @@ -347,8 +347,8 @@ Slice::VbGenerator::writeMarshalUnmarshalCode(Output &out, { if(isOutParam) { - out << nl << "IceInternal.ParamPatcher " << param - << "_PP = New IceInternal.ParamPatcher(TypeOf(Ice.Object))"; + out << nl << "Dim " << param + << "_PP As IceInternal.ParamPatcher = New IceInternal.ParamPatcher(GetType(Ice.Object)"; out << nl << stream << ".readObject(" << param << "_PP)"; } else @@ -382,7 +382,8 @@ Slice::VbGenerator::writeMarshalUnmarshalCode(Output &out, ProxyPtr prx = ProxyPtr::dynamicCast(type); if(prx) { - string helperName = fixId(ContainedPtr::dynamicCast(type)->scoped() + "Helper"); + ContainedPtr contained = ContainedPtr::dynamicCast(type); + string helperName = fixId((contained ? contained->scoped() : typeToString(type)) + "Helper"); if(marshal) { out << nl << helperName << ".__write(" << stream << ", " << param << ')'; @@ -405,8 +406,9 @@ Slice::VbGenerator::writeMarshalUnmarshalCode(Output &out, { if(isOutParam) { - out << nl << "IceInternal.ParamPatcher " << param - << "_PP = New IceInternal.ParamPatcher(TypeOf(" << typeToString(type) << "))"; + out << nl << "Dim " << param + << "_PP As IceInternal.ParamPatcher = New IceInternal.ParamPatcher(GetType(" + << typeToString(type) << "))"; out << nl << stream << ".readObject(" << param << "_PP)"; } else @@ -427,7 +429,7 @@ Slice::VbGenerator::writeMarshalUnmarshalCode(Output &out, else { string typeS = typeToString(type); - out << nl << param << " = New " << typeS << "()"; + out << nl << param << " = New " << typeS; out << nl << param << ".__read(" << stream << ")"; } return; |