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/EndpointI.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/EndpointI.h')
| -rw-r--r-- | cpp/src/Ice/EndpointI.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h index 17f079d1c1e..e7e1a208f19 100644 --- a/cpp/src/Ice/EndpointI.h +++ b/cpp/src/Ice/EndpointI.h @@ -105,16 +105,6 @@ public: virtual bool secure() const = 0; // - // Returns the encoding version supported by this endpoint. - // - const ::Ice::EncodingVersion& encodingVersion() const; - - // - // Returns the encoding version supported by this endpoint. - // - const ::Ice::ProtocolVersion& protocolVersion() const; - - // // Return a server side transceiver for this endpoint, or null if a // transceiver can only be created by an acceptor. In case a // transceiver is created, this operation also returns a new @@ -165,15 +155,11 @@ protected: virtual std::vector<ConnectorPtr> connectors(const std::vector<Address>&) const; friend class EndpointHostResolver; - EndpointI(const Ice::ProtocolVersion&, const Ice::EncodingVersion&, const std::string&); + EndpointI(const std::string&); EndpointI(); - void parseOption(const std::string&, const std::string&, const std::string&, const std::string&); - virtual ::Ice::Int hashInit() const = 0; - const Ice::ProtocolVersion _protocol; - const Ice::EncodingVersion _encoding; const std::string _connectionId; private: |