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/LocatorInfo.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/src/Ice/LocatorInfo.h')
| -rw-r--r-- | cpp/src/Ice/LocatorInfo.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h index c719eea134d..2c50be287d9 100644 --- a/cpp/src/Ice/LocatorInfo.h +++ b/cpp/src/Ice/LocatorInfo.h @@ -132,7 +132,11 @@ public: bool _sent; bool _response; Ice::ObjectPrxPtr _proxy; +#ifdef ICE_CPP11_MAPPING + std::exception_ptr _exception; +#else IceUtil::UniquePtr<Ice::Exception> _exception; +#endif }; typedef IceUtil::Handle<Request> RequestPtr; |