summaryrefslogtreecommitdiff
path: root/cpp/src/IceIAP
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceIAP')
-rw-r--r--cpp/src/IceIAP/Transceiver.h5
-rw-r--r--cpp/src/IceIAP/Transceiver.mm4
2 files changed, 1 insertions, 8 deletions
diff --git a/cpp/src/IceIAP/Transceiver.h b/cpp/src/IceIAP/Transceiver.h
index b82ed27c395..ee625845713 100644
--- a/cpp/src/IceIAP/Transceiver.h
+++ b/cpp/src/IceIAP/Transceiver.h
@@ -45,11 +45,8 @@ 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&);
diff --git a/cpp/src/IceIAP/Transceiver.mm b/cpp/src/IceIAP/Transceiver.mm
index 23496965421..0d7c332120d 100644
--- a/cpp/src/IceIAP/Transceiver.mm
+++ b/cpp/src/IceIAP/Transceiver.mm
@@ -254,11 +254,7 @@ IceObjC::iAPTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer)
}
SocketOperation
-#ifdef ICE_CPP11_MAPPING
-IceObjC::iAPTransceiver::closing(bool initiator, exception_ptr)
-#else
IceObjC::iAPTransceiver::closing(bool initiator, const Ice::LocalException&)
-#endif
{
// If we are initiating the connection closure, wait for the peer
// to close the TCP/IP connection. Otherwise, close immediately.