diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-01-15 10:15:19 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-01-15 10:15:19 +0100 |
| commit | f00672fd53741dc528b81ed7f53dcca8276c2014 (patch) | |
| tree | 3625b90e69b8b3ffefc35567c1eeafb2ef07c276 /cpp/src/Ice/Reference.h | |
| parent | More documentation changes wrt mcpp usage. (diff) | |
| download | ice-f00672fd53741dc528b81ed7f53dcca8276c2014.tar.bz2 ice-f00672fd53741dc528b81ed7f53dcca8276c2014.tar.xz ice-f00672fd53741dc528b81ed7f53dcca8276c2014.zip | |
Fixed bug 1359
Diffstat (limited to 'cpp/src/Ice/Reference.h')
| -rw-r--r-- | cpp/src/Ice/Reference.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h index 95715300787..e9b862c01df 100644 --- a/cpp/src/Ice/Reference.h +++ b/cpp/src/Ice/Reference.h @@ -92,12 +92,12 @@ public: ReferencePtr changeMode(Mode) const; ReferencePtr changeIdentity(const Ice::Identity&) const; ReferencePtr changeFacet(const std::string&) const; + virtual ReferencePtr changeCompress(bool) const; virtual ReferencePtr changeSecure(bool) const = 0; virtual ReferencePtr changePreferSecure(bool) const = 0; virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const = 0; virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const = 0; - virtual ReferencePtr changeCompress(bool) const = 0; virtual ReferencePtr changeTimeout(int) const = 0; virtual ReferencePtr changeConnectionId(const std::string&) const = 0; virtual ReferencePtr changeCollocationOptimization(bool) const = 0; @@ -142,6 +142,9 @@ protected: mutable Ice::Int _hashValue; mutable bool _hashInitialized; + bool _overrideCompress; + bool _compress; // Only used if _overrideCompress == true + private: const InstancePtr _instance; @@ -176,7 +179,6 @@ public: virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const; virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const; virtual ReferencePtr changeCollocationOptimization(bool) const; - virtual ReferencePtr changeCompress(bool) const; virtual ReferencePtr changeTimeout(int) const; virtual ReferencePtr changeConnectionId(const std::string&) const; virtual ReferencePtr changeLocatorCacheTimeout(int) const; @@ -226,7 +228,6 @@ public: virtual ReferencePtr changePreferSecure(bool) const; virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const; virtual ReferencePtr changeCollocationOptimization(bool) const; - virtual ReferencePtr changeCompress(bool) const; virtual ReferencePtr changeTimeout(int) const; virtual ReferencePtr changeConnectionId(const std::string&) const; virtual ReferencePtr changeCacheConnection(bool) const; @@ -264,8 +265,6 @@ private: Ice::EndpointSelectionType _endpointSelection; std::string _connectionId; - bool _overrideCompress; - bool _compress; // Only used if _overrideCompress == true bool _overrideTimeout; int _timeout; // Only used if _overrideTimeout == true bool _threadPerConnection; |