diff options
author | Benoit Foucher <benoit@zeroc.com> | 2008-02-14 18:08:59 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2008-02-14 18:08:59 +0100 |
commit | a95ccc73ef5572109532f3e94498d31df106195d (patch) | |
tree | 0062b9c56c133da43a9c7ff5536e9d5b5dbaae89 /cpp/src/slice2cpp/Gen.cpp | |
parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
download | ice-a95ccc73ef5572109532f3e94498d31df106195d.tar.bz2 ice-a95ccc73ef5572109532f3e94498d31df106195d.tar.xz ice-a95ccc73ef5572109532f3e94498d31df106195d.zip |
- Fixed bug 2688
- Fixed bug 2674
- Changed connection validation to always use non-blocking IO (bug 1981)
- Added distribution/src/common/RELEASE_NOTES.txt
- Moved distribution/src/windows/README.DEMOS to distribution/src/common
Diffstat (limited to 'cpp/src/slice2cpp/Gen.cpp')
-rwxr-xr-x | cpp/src/slice2cpp/Gen.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 42a39edd084..99246a22d77 100755 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2309,16 +2309,16 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) C << sb; if(p->mode() == Operation::Idempotent || p->mode() == Operation::Nonmutating) { - C << nl << "__handleExceptionWrapperRelaxed(__delBase, __ex, __cnt);"; + C << nl << "__handleExceptionWrapperRelaxed(__delBase, __ex, 0, __cnt);"; } else { - C << nl << "__handleExceptionWrapper(__delBase, __ex);"; + C << nl << "__handleExceptionWrapper(__delBase, __ex, 0);"; } C << eb; C << nl << "catch(const ::Ice::LocalException& __ex)"; C << sb; - C << nl << "__handleException(__delBase, __ex, __cnt);"; + C << nl << "__handleException(__delBase, __ex, 0, __cnt);"; C << eb; C << eb; C << eb; |