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/TcpConnector.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/TcpConnector.h')
-rw-r--r-- | cpp/src/Ice/TcpConnector.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Ice/TcpConnector.h b/cpp/src/Ice/TcpConnector.h index 9c504a0ebca..e25b9f2e3a8 100644 --- a/cpp/src/Ice/TcpConnector.h +++ b/cpp/src/Ice/TcpConnector.h @@ -36,7 +36,7 @@ public: private: - TcpConnector(const InstancePtr&, const Address&, Ice::Int, const std::string&); + TcpConnector(const InstancePtr&, const Address&, const NetworkProxyPtr&, Ice::Int, const std::string&); virtual ~TcpConnector(); friend class TcpEndpointI; @@ -44,6 +44,7 @@ private: const TraceLevelsPtr _traceLevels; const ::Ice::LoggerPtr _logger; const Address _addr; + const NetworkProxyPtr _proxy; const Ice::Int _timeout; const std::string _connectionId; }; |