diff options
author | Benoit Foucher <benoit@zeroc.com> | 2012-11-13 10:17:27 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2012-11-13 10:17:27 +0100 |
commit | 99b44d083eeee5583adfe642081a827224fa1309 (patch) | |
tree | 46bb3af634cbd5d90b9e5d46099f4e0e85f70ec6 /cpp/src/Ice/TcpConnector.h | |
parent | Cosmetic updates to IceGrid Admin connection wizard (diff) | |
download | ice-99b44d083eeee5583adfe642081a827224fa1309.tar.bz2 ice-99b44d083eeee5583adfe642081a827224fa1309.tar.xz ice-99b44d083eeee5583adfe642081a827224fa1309.zip |
Fixed ICE-4927: fixed proxy encoding to marshal protocol/encoding version instead of encoding it in endpoints
Diffstat (limited to 'cpp/src/Ice/TcpConnector.h')
-rw-r--r-- | cpp/src/Ice/TcpConnector.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cpp/src/Ice/TcpConnector.h b/cpp/src/Ice/TcpConnector.h index 341696087ef..6a1d5fdab50 100644 --- a/cpp/src/Ice/TcpConnector.h +++ b/cpp/src/Ice/TcpConnector.h @@ -36,8 +36,7 @@ public: private: - TcpConnector(const InstancePtr&, const Address&, Ice::Int, const Ice::ProtocolVersion&, - const Ice::EncodingVersion&, const std::string&); + TcpConnector(const InstancePtr&, const Address&, Ice::Int, const std::string&); virtual ~TcpConnector(); friend class TcpEndpointI; @@ -46,8 +45,6 @@ private: const ::Ice::LoggerPtr _logger; const Address _addr; const Ice::Int _timeout; - const Ice::ProtocolVersion _protocol; - const Ice::EncodingVersion _encoding; const std::string _connectionId; }; |