1 files changed, 8 insertions, 4 deletions
diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h
index 0536ad8e1f5..452b4afd6a1 100644
--- a/cpp/src/Ice/Transceiver.h
+++ b/cpp/src/Ice/Transceiver.h
@@ -21,23 +21,27 @@ namespace IceInternal
 
 class Buffer;
 
-class ICE_API Transceiver : virtual public ::IceUtil::Shared
+class ICE_API Transceiver : public virtual ::IceUtil::Shared
 {
 public:
 
     virtual NativeInfoPtr getNativeInfo() = 0;
 
-    virtual SocketOperation initialize(Buffer&, Buffer&, bool&) = 0;
+    virtual SocketOperation initialize(Buffer&, Buffer&) = 0;
+#ifdef ICE_CPP11_MAPPING
+    virtual SocketOperation closing(bool, std::exception_ptr) = 0;
+#else
     virtual SocketOperation closing(bool, const Ice::LocalException&) = 0;
+#endif
     virtual void close() = 0;
     virtual EndpointIPtr bind();
     virtual SocketOperation write(Buffer&) = 0;
-    virtual SocketOperation read(Buffer&, bool&) = 0;
+    virtual SocketOperation read(Buffer&) = 0;
 #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual bool startWrite(Buffer&) = 0;
     virtual void finishWrite(Buffer&) = 0;
     virtual void startRead(Buffer&) = 0;
-    virtual void finishRead(Buffer&, bool&) = 0;
+    virtual void finishRead(Buffer&) = 0;
 #endif
 
     virtual std::string protocol() const = 0;