diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2014-09-17 13:50:35 -0230 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2014-09-17 13:50:35 -0230 |
commit | a3d676c4199ff53edd458abf7ce52f6cf83213b4 (patch) | |
tree | d6975ba5b7c3d9e58b5378f2e27ec536e4157517 /cpp/src/Ice/WSEndpoint.cpp | |
parent | Simplified creation of Admin facets in IceBox; simplified test for Admin enab... (diff) | |
download | ice-a3d676c4199ff53edd458abf7ce52f6cf83213b4.tar.bz2 ice-a3d676c4199ff53edd458abf7ce52f6cf83213b4.tar.xz ice-a3d676c4199ff53edd458abf7ce52f6cf83213b4.zip |
ICE-4891 some minor improvements
Diffstat (limited to 'cpp/src/Ice/WSEndpoint.cpp')
-rw-r--r-- | cpp/src/Ice/WSEndpoint.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp index b128fe13cc2..b6290f1774a 100644 --- a/cpp/src/Ice/WSEndpoint.cpp +++ b/cpp/src/Ice/WSEndpoint.cpp @@ -19,6 +19,8 @@ using namespace std; using namespace Ice; using namespace IceInternal; +IceUtil::Shared* IceInternal::upCast(WSEndpoint* p) { return p; } + IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, const string& res) : _instance(instance), _delegate(IPEndpointIPtr::dynamicCast(del)), _resource(res) { @@ -236,20 +238,12 @@ AcceptorPtr IceInternal::WSEndpoint::acceptor(const string& adapterName) const { AcceptorPtr delAcc = _delegate->acceptor(adapterName); - return new WSAcceptor(_instance, delAcc); -} - -EndpointIPtr -IceInternal::WSEndpoint::endpoint(const TransceiverPtr& transceiver) const -{ - return const_cast<WSEndpoint*>(this); + return new WSAcceptor(const_cast<WSEndpoint*>(this), _instance, delAcc); } -EndpointIPtr -IceInternal::WSEndpoint::endpoint(const AcceptorPtr& acceptor) const +WSEndpointPtr +IceInternal::WSEndpoint::endpoint(const EndpointIPtr& delEndp) const { - WSAcceptor* p = dynamic_cast<WSAcceptor*>(acceptor.get()); - EndpointIPtr delEndp = _delegate->endpoint(p->delegate()); return new WSEndpoint(_instance, delEndp, _resource); } |