diff options
| author | Mark Spruiell <mes@zeroc.com> | 2013-04-04 16:02:42 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2013-04-04 16:02:42 -0700 |
| commit | 9cb665138c7d2422739e32b40a249c64fd3b6cd5 (patch) | |
| tree | 94759d916599ca08761b98580185a230744ac67a /cpp/src/Ice/TcpEndpointI.h | |
| parent | x64 VC10 icexml35d.dll was linked to wrong file (diff) | |
| download | ice-9cb665138c7d2422739e32b40a249c64fd3b6cd5.tar.bz2 ice-9cb665138c7d2422739e32b40a249c64fd3b6cd5.tar.xz ice-9cb665138c7d2422739e32b40a249c64fd3b6cd5.zip | |
* SOCKS support for C++
* Minor cleanup in C#
* Unity fixes
Diffstat (limited to 'cpp/src/Ice/TcpEndpointI.h')
| -rw-r--r-- | cpp/src/Ice/TcpEndpointI.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h index 294bf79a00e..5d3cb602ed0 100644 --- a/cpp/src/Ice/TcpEndpointI.h +++ b/cpp/src/Ice/TcpEndpointI.h @@ -44,6 +44,7 @@ public: virtual AcceptorPtr acceptor(EndpointIPtr&, const std::string&) const; virtual std::vector<EndpointIPtr> expand() const; virtual bool equivalent(const EndpointIPtr&) const; + virtual std::vector<ConnectorPtr> connectors(const std::vector<Address>&, const NetworkProxyPtr&) const; virtual bool operator==(const Ice::LocalObject&) const; virtual bool operator<(const Ice::LocalObject&) const; @@ -55,7 +56,6 @@ public: private: virtual ::Ice::Int hashInit() const; - virtual std::vector<ConnectorPtr> connectors(const std::vector<IceInternal::Address>&) const; // // All members are const, because endpoints are immutable. |