1 files changed, 9 insertions, 5 deletions
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index 4be06f31b72..99898f4e2be 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -25,13 +25,17 @@ IceInternal::TcpTransceiver::getNativeInfo()
 }
 
 SocketOperation
-IceInternal::TcpTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer, bool&)
+IceInternal::TcpTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer)
 {
     return _stream->connect(readBuffer, writeBuffer);
 }
 
 SocketOperation
+#ifdef ICE_CPP11_MAPPING
+IceInternal::TcpTransceiver::closing(bool initiator, exception_ptr)
+#else
 IceInternal::TcpTransceiver::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.
@@ -51,7 +55,7 @@ IceInternal::TcpTransceiver::write(Buffer& buf)
 }
 
 SocketOperation
-IceInternal::TcpTransceiver::read(Buffer& buf, bool&)
+IceInternal::TcpTransceiver::read(Buffer& buf)
 {
     return _stream->read(buf);
 }
@@ -76,7 +80,7 @@ IceInternal::TcpTransceiver::startRead(Buffer& buf)
 }
 
 void
-IceInternal::TcpTransceiver::finishRead(Buffer& buf, bool&)
+IceInternal::TcpTransceiver::finishRead(Buffer& buf)
 {
     _stream->finishRead(buf);
 }
@@ -103,7 +107,7 @@ IceInternal::TcpTransceiver::toDetailedString() const
 Ice::ConnectionInfoPtr
 IceInternal::TcpTransceiver::getInfo() const
 {
-    TCPConnectionInfoPtr info = new TCPConnectionInfo();
+    TCPConnectionInfoPtr info = ICE_MAKE_SHARED(TCPConnectionInfo);
     fillConnectionInfo(info);
     return info;
 }
@@ -111,7 +115,7 @@ IceInternal::TcpTransceiver::getInfo() const
 Ice::ConnectionInfoPtr
 IceInternal::TcpTransceiver::getWSInfo(const Ice::HeaderDict& headers) const
 {
-    WSConnectionInfoPtr info = new WSConnectionInfo();
+    WSConnectionInfoPtr info = ICE_MAKE_SHARED(WSConnectionInfo);
     fillConnectionInfo(info);
     info->headers = headers;
     return info;