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/IceBT | |
| 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/IceBT')
| -rw-r--r-- | cpp/src/IceBT/TransceiverI.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceBT/TransceiverI.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/cpp/src/IceBT/TransceiverI.cpp b/cpp/src/IceBT/TransceiverI.cpp index ef0863ddcf1..fa89d2b900a 100644 --- a/cpp/src/IceBT/TransceiverI.cpp +++ b/cpp/src/IceBT/TransceiverI.cpp @@ -35,7 +35,11 @@ IceBT::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::Bu } IceInternal::SocketOperation +#ifdef ICE_CPP11_MAPPING +IceBT::TransceiverI::closing(bool initiator, exception_ptr) +#else IceBT::TransceiverI::closing(bool initiator, const Ice::LocalException&) +#endif { // // If we are initiating the connection closure, wait for the peer diff --git a/cpp/src/IceBT/TransceiverI.h b/cpp/src/IceBT/TransceiverI.h index 0f8df49e9cf..df2fcbcefd3 100644 --- a/cpp/src/IceBT/TransceiverI.h +++ b/cpp/src/IceBT/TransceiverI.h @@ -28,7 +28,11 @@ public: virtual IceInternal::NativeInfoPtr getNativeInfo(); virtual IceInternal::SocketOperation initialize(IceInternal::Buffer&, IceInternal::Buffer&); +#ifdef ICE_CPP11_MAPPING + virtual IceInternal::SocketOperation closing(bool, std::exception_ptr); +#else virtual IceInternal::SocketOperation closing(bool, const Ice::LocalException&); +#endif virtual void close(); virtual IceInternal::SocketOperation write(IceInternal::Buffer&); virtual IceInternal::SocketOperation read(IceInternal::Buffer&); |