diff options
| author | Jose <jose@zeroc.com> | 2016-01-08 21:10:14 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-01-08 21:10:14 +0100 |
| commit | 93ab5a8f08970ad49c6f973b965b8fbefb63882f (patch) | |
| tree | 18c00abdc514ca90a7ab6e1acc5b350847843681 /cpp/src/Ice/OutgoingAsync.cpp | |
| parent | C++98 test minor build fix (diff) | |
| download | ice-93ab5a8f08970ad49c6f973b965b8fbefb63882f.tar.bz2 ice-93ab5a8f08970ad49c6f973b965b8fbefb63882f.tar.xz ice-93ab5a8f08970ad49c6f973b965b8fbefb63882f.zip | |
C++11 fix Exception::ice_clone to use exception_ptr
Diffstat (limited to 'cpp/src/Ice/OutgoingAsync.cpp')
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index d3af4f3d780..74bdd2c9bd0 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -863,10 +863,24 @@ ConnectionFlushBatchAsync::invoke() } catch(const RetryException& ex) { +#ifdef ICE_CPP11_MAPPING + try + { + rethrow_exception(ex.get()); + } + catch(const Ice::LocalException& ee) + { + if(completed(ee)) + { + invokeCompletedAsync(); + } + } +#else if(completed(*ex.get())) { invokeCompletedAsync(); } +#endif } catch(const Exception& ex) { |