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/include/Ice/AsyncResult.h | |
| 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/include/Ice/AsyncResult.h')
| -rw-r--r-- | cpp/include/Ice/AsyncResult.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cpp/include/Ice/AsyncResult.h b/cpp/include/Ice/AsyncResult.h index e682f2d0ee9..12a021e9e7f 100644 --- a/cpp/include/Ice/AsyncResult.h +++ b/cpp/include/Ice/AsyncResult.h @@ -147,10 +147,18 @@ private: const std::string& _operation; const IceInternal::CallbackBasePtr _callback; const LocalObjectPtr _cookie; +#ifdef ICE_CPP11_MAPPING + std::exception_ptr _exception; +#else IceUtil::UniquePtr<Exception> _exception; - +#endif + IceInternal::CancellationHandlerPtr _cancellationHandler; +#ifdef ICE_CPP11_MAPPING + std::exception_ptr _cancellationException; +#else IceUtil::UniquePtr<Ice::LocalException> _cancellationException; +#endif static const unsigned char OK; static const unsigned char Done; |