diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-06-27 17:54:30 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-06-27 17:54:30 +0200 |
| commit | c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7 (patch) | |
| tree | 5cb64dfe155e5d2349efb6c7dc4b0f5b5284d44a /cpp/src/Ice/TcpEndpointI.h | |
| parent | Fix Windows php build to restore nuget packages (diff) | |
| download | ice-c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7.tar.bz2 ice-c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7.tar.xz ice-c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7.zip | |
Refactored SSL and iAP transports, support for running SSL on top
of TCP/iAP/Bluetooth.
Diffstat (limited to 'cpp/src/Ice/TcpEndpointI.h')
| -rw-r--r-- | cpp/src/Ice/TcpEndpointI.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h index ffc6743e213..f40c5c14713 100644 --- a/cpp/src/Ice/TcpEndpointI.h +++ b/cpp/src/Ice/TcpEndpointI.h @@ -14,12 +14,11 @@ #include <Ice/IPEndpointI.h> #include <Ice/EndpointFactory.h> #include <Ice/Network.h> // for IceIternal::Address -#include <Ice/WSEndpoint.h> namespace IceInternal { -class TcpEndpointI : public IPEndpointI, public WSEndpointDelegate +class TcpEndpointI : public IPEndpointI, public Ice::EnableSharedFromThis<TcpEndpointI> { public: @@ -28,8 +27,9 @@ public: TcpEndpointI(const ProtocolInstancePtr&); TcpEndpointI(const ProtocolInstancePtr&, Ice::InputStream*); + virtual void streamWriteImpl(Ice::OutputStream*) const; + virtual Ice::EndpointInfoPtr getInfo() const; - virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const; virtual Ice::Int timeout() const; virtual EndpointIPtr timeout(Ice::Int) const; @@ -51,10 +51,10 @@ public: TcpEndpointIPtr endpoint(const TcpAcceptorPtr&) const; using IPEndpointI::connectionId; + using Ice::EnableSharedFromThis<TcpEndpointI>::shared_from_this; protected: - virtual void streamWriteImpl(Ice::OutputStream*) const; virtual void hashInit(Ice::Int&) const; virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const; virtual bool checkOption(const std::string&, const std::string&, const std::string&); @@ -84,7 +84,7 @@ public: virtual EndpointIPtr read(Ice::InputStream*) const; virtual void destroy(); - virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const; + virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&, const EndpointFactoryPtr&) const; private: |