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.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/BatchRequestQueue.h')
| -rw-r--r-- | cpp/src/Ice/BatchRequestQueue.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/Ice/BatchRequestQueue.h b/cpp/src/Ice/BatchRequestQueue.h index 359113a7973..64d6bc5f658 100644 --- a/cpp/src/Ice/BatchRequestQueue.h +++ b/cpp/src/Ice/BatchRequestQueue.h @@ -54,7 +54,11 @@ private: bool _batchStreamCanFlush; int _batchRequestNum; size_t _batchMarker; +#ifdef ICE_CPP11_MAPPING + std::exception_ptr _exception; +#else IceUtil::UniquePtr<Ice::LocalException> _exception; +#endif size_t _maxSize; }; |