diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-10-10 12:03:07 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-10-10 12:03:07 +0200 |
| commit | 570455a381e6620f8ddfcca448559d3fa545ba38 (patch) | |
| tree | fe3fa45e6a643b473d9370babff6224b1a9d4dcb /cpp/src/slice2cs | |
| parent | Fixed ICE-5726: provide deprecated public StringConverterPlugin (diff) | |
| download | ice-570455a381e6620f8ddfcca448559d3fa545ba38.tar.bz2 ice-570455a381e6620f8ddfcca448559d3fa545ba38.tar.xz ice-570455a381e6620f8ddfcca448559d3fa545ba38.zip | |
Fixed invocation timeouts/interrupt issues, addded AsyncResult.cancel()
Diffstat (limited to 'cpp/src/slice2cs')
| -rw-r--r-- | cpp/src/slice2cs/Gen.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index b877d04ce69..8ba2d479750 100644 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -5312,8 +5312,8 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) _out << sb; if(op->returnsData()) { - _out << nl << "IceInternal.OutgoingAsync outAsync__ = (IceInternal.OutgoingAsync)r__;"; - _out << nl << "IceInternal.OutgoingAsync.check(outAsync__, this, " << flatName << ");"; + _out << nl << "IceInternal.OutgoingAsync outAsync__ = IceInternal.OutgoingAsync.check(r__, this, " + << flatName << ");"; _out << nl << "try"; _out << sb; @@ -5480,11 +5480,11 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) _out << nl << "result__.writeEmptyParams();"; } - _out << nl << "result__.invoke(true);"; + _out << nl << "result__.invoke();"; _out << eb; _out << nl << "catch(Ice.Exception ex__)"; _out << sb; - _out << nl << "result__.invokeExceptionAsync(ex__);"; + _out << nl << "result__.abort(ex__);"; _out << eb; _out << nl << "return result__;"; _out << eb; |