diff options
Diffstat (limited to 'cpp/src/Ice/Reference.h')
-rw-r--r-- | cpp/src/Ice/Reference.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h index 4fad67eab08..ceff28a7c01 100644 --- a/cpp/src/Ice/Reference.h +++ b/cpp/src/Ice/Reference.h @@ -55,6 +55,7 @@ public: Mode getMode() const { return _mode; } bool getSecure() const { return _secure; } + const Ice::ProtocolVersion& getProtocol() const { return _protocol; } const Ice::EncodingVersion& getEncoding() const { return _encoding; } const Ice::Identity& getIdentity() const { return _identity; } const std::string& getFacet() const { return _facet; } @@ -85,7 +86,7 @@ public: ReferencePtr changeSecure(bool) const; ReferencePtr changeIdentity(const Ice::Identity&) const; ReferencePtr changeFacet(const std::string&) const; - ReferencePtr changeEncoding(const Ice::EncodingVersion&) const; + virtual ReferencePtr changeEncoding(const Ice::EncodingVersion&) const; virtual ReferencePtr changeCompress(bool) const; virtual ReferencePtr changeEndpoints(const std::vector<EndpointIPtr>&) const = 0; @@ -139,7 +140,7 @@ public: protected: Reference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&, const std::string&, Mode, bool, - const Ice::EncodingVersion&); + const Ice::ProtocolVersion&, const Ice::EncodingVersion&); Reference(const Reference&); virtual Ice::Int hashInit() const; @@ -157,6 +158,7 @@ private: Ice::Identity _identity; SharedContextPtr _context; std::string _facet; + Ice::ProtocolVersion _protocol; Ice::EncodingVersion _encoding; protected: @@ -222,8 +224,9 @@ class RoutableReference : public Reference public: RoutableReference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&, const std::string&, Mode, - bool, const Ice::EncodingVersion&, const std::vector<EndpointIPtr>&, const std::string&, - const LocatorInfoPtr&, const RouterInfoPtr&, bool, bool, bool, Ice::EndpointSelectionType, int); + bool, const Ice::ProtocolVersion&, const Ice::EncodingVersion&, const std::vector<EndpointIPtr>&, + const std::string&, const LocatorInfoPtr&, const RouterInfoPtr&, bool, bool, bool, + Ice::EndpointSelectionType, int); virtual std::vector<EndpointIPtr> getEndpoints() const; virtual std::string getAdapterId() const; @@ -236,6 +239,7 @@ public: virtual int getLocatorCacheTimeout() const; virtual std::string getConnectionId() const; + virtual ReferencePtr changeEncoding(const Ice::EncodingVersion&) const; virtual ReferencePtr changeCompress(bool) const; virtual ReferencePtr changeEndpoints(const std::vector<EndpointIPtr>&) const; virtual ReferencePtr changeAdapterId(const std::string&) const; |