summaryrefslogtreecommitdiff
path: root/cpp/src/slice2cs
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-07-11 21:02:01 +0200
committerJose <jose@zeroc.com>2016-07-11 21:02:01 +0200
commit7dcc23e3a2936f7a8252d2be3c5d35debc68cc1b (patch)
tree6fd64dff92249801d83f373da3c1dd5cfe18b6cb /cpp/src/slice2cs
parentFixed streamFilename bug (diff)
downloadice-7dcc23e3a2936f7a8252d2be3c5d35debc68cc1b.tar.bz2
ice-7dcc23e3a2936f7a8252d2be3c5d35debc68cc1b.tar.xz
ice-7dcc23e3a2936f7a8252d2be3c5d35debc68cc1b.zip
CSharp updates for Visual Studio 2013 compatibility
Diffstat (limited to 'cpp/src/slice2cs')
-rw-r--r--cpp/src/slice2cs/Gen.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 1b74ff5b634..2fca1a449b1 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -5429,7 +5429,9 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
_out.inc();
_out << nl << "(" << delType << " cb__, " << (returnTypeS.empty() ? "object" : returnTypeS) << " ret__) =>";
_out << sb;
- _out << nl << "cb__?.Invoke" << spar;
+ _out << nl << "if(cb__ != null)";
+ _out << sb;
+ _out << nl << "cb__.Invoke" << spar;
if(ret && outParams.empty())
{
_out << "ret__";
@@ -5450,6 +5452,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
_out << "ret__";
}
_out << epar << ';';
+ _out << eb;
_out << eb << ",";
_out << nl << "this, " << flatName << ", cookie__, completedCallback__);";