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/BatchRequestQueue.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/BatchRequestQueue.cpp')
| -rw-r--r-- | cpp/src/Ice/BatchRequestQueue.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp index 4f1c39c234f..9f5d506545b 100644 --- a/cpp/src/Ice/BatchRequestQueue.cpp +++ b/cpp/src/Ice/BatchRequestQueue.cpp @@ -90,11 +90,10 @@ void BatchRequestQueue::prepareBatchRequest(BasicStream* os) { Lock sync(*this); - if(_exception.get()) + if(ICE_EXCEPTION_GET(_exception)) { - _exception->ice_throw(); + ICE_RETHROW_EXCEPTION(_exception); } - waitStreamInUse(false); _batchStreamInUse = true; _batchStream.swap(*os); @@ -207,7 +206,11 @@ void BatchRequestQueue::destroy(const Ice::LocalException& ex) { Lock sync(*this); +#ifdef ICE_CPP11_MAPPING + _exception = ex.ice_clone(); +#else _exception.reset(ex.ice_clone()); +#endif } bool |