ICE-4891 some minor improvements

1 files changed, 7 insertions, 11 deletions

diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp
index 49b44649038..68f24ebb917 100644
--- a/cpp/src/Ice/TcpEndpointI.cpp
+++ b/cpp/src/Ice/TcpEndpointI.cpp
@@ -21,6 +21,8 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+IceUtil::Shared* IceInternal::upCast(TcpEndpointI* p) { return p; }
+
 IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance, const string& host, Int port,
                                         const Address& sourceAddr, Int timeout, const string& connectionId,
                                         bool compress) :
@@ -144,20 +146,14 @@ IceInternal::TcpEndpointI::transceiver() const
 AcceptorPtr
 IceInternal::TcpEndpointI::acceptor(const string&) const
 {
-    return new TcpAcceptor(_instance, _host, _port);
-}
-
-EndpointIPtr
-IceInternal::TcpEndpointI::endpoint(const TransceiverPtr& transceiver) const
-{
-    return const_cast<TcpEndpointI*>(this);
+    return new TcpAcceptor(const_cast<TcpEndpointI*>(this), _instance, _host, _port);
 }
 
-EndpointIPtr
-IceInternal::TcpEndpointI::endpoint(const AcceptorPtr& acceptor) const
+TcpEndpointIPtr
+IceInternal::TcpEndpointI::endpoint(const TcpAcceptorPtr& acceptor) const
 {
-    TcpAcceptor* p = dynamic_cast<TcpAcceptor*>(acceptor.get());
-    return createEndpoint(_host, p->effectivePort(), _connectionId);
+    return new TcpEndpointI(_instance, _host, acceptor->effectivePort(), _sourceAddr, _timeout, _connectionId,
+                            _compress);
 }
 
 string