summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2004-09-14 04:52:34 +0000
committerMichi Henning <michi@zeroc.com>2004-09-14 04:52:34 +0000
commit7d3bdad8221705929b6227bfd6c604ee301c5d5a (patch)
tree0ff37aa94aa1c45f6e13641e1b9406504c6e53eb /cpp/src
parentChange to disallow global definitions broke this demo because it used the (diff)
downloadice-7d3bdad8221705929b6227bfd6c604ee301c5d5a.tar.bz2
ice-7d3bdad8221705929b6227bfd6c604ee301c5d5a.tar.xz
ice-7d3bdad8221705929b6227bfd6c604ee301c5d5a.zip
Fixed incorrect cast in generated code.
Diffstat (limited to 'cpp/src')
-rwxr-xr-xcpp/src/slice2cs/Gen.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index c45426ccf3e..9cf8ae45aa7 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -202,7 +202,7 @@ Slice::CsVisitor::writeDispatch(const ClassDefPtr& p)
_out << sb;
_out << nl << "return _System.Array.BinarySearch(__ids, s) >= 0;";
_out << eb;
- _out << "else";
+ _out << nl << "else";
_out << sb;
_out << nl << "return _System.Array.BinarySearch(__ids, s, _System.Collections.Comparer.DefaultInvariant) >= 0;";
_out << eb;
@@ -214,7 +214,7 @@ Slice::CsVisitor::writeDispatch(const ClassDefPtr& p)
_out << sb;
_out << nl << "return _System.Array.BinarySearch(__ids, s) >= 0;";
_out << eb;
- _out << "else";
+ _out << nl << "else";
_out << sb;
_out << nl << "return _System.Array.BinarySearch(__ids, s, _System.Collections.Comparer.DefaultInvariant) >= 0;";
_out << eb;
@@ -3397,7 +3397,7 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p)
{
_out << "return ";
}
- _out << "((" << fixId(containingClass->name()) << ")__servant)."
+ _out << "((" << fixId(containingClass->scoped()) << ")__servant)."
<< opName << spar << args << "__current" << epar << ';';
if(!ret)
{