1 files changed, 12 insertions, 1 deletions
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index 3addd9a29f0..62aa8871668 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -72,6 +72,10 @@ public:
     const InstancePtr& getInstance() const { return _instance; }
     const SharedContextPtr& getContext() const { return _context; }
     int getInvocationTimeout() const { return _invocationTimeout; }
+    IceUtil::Optional<bool> getCompress() const
+    {
+        return _overrideCompress ? IceUtil::Optional<bool>(_compress) : IceUtil::None;
+    }
 
     Ice::CommunicatorPtr getCommunicator() const;
 
@@ -85,6 +89,7 @@ public:
     virtual Ice::EndpointSelectionType getEndpointSelection() const = 0;
     virtual int getLocatorCacheTimeout() const = 0;
     virtual std::string getConnectionId() const = 0;
+    virtual IceUtil::Optional<int> getTimeout() const = 0;
 
     //
     // The change* methods (here and in derived classes) create
@@ -112,6 +117,7 @@ public:
 
     virtual ReferencePtr changeTimeout(int) const = 0;
     virtual ReferencePtr changeConnectionId(const std::string&) const = 0;
+    virtual ReferencePtr changeConnection(const Ice::ConnectionIPtr&) const = 0;
 
     int hash() const; // Conceptually const.
 
@@ -185,7 +191,8 @@ class FixedReference : public Reference
 public:
 
     FixedReference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&, const std::string&, Mode,
-                   bool, const Ice::EncodingVersion&, const Ice::ConnectionIPtr&);
+                   bool, const Ice::ProtocolVersion&, const Ice::EncodingVersion&, const Ice::ConnectionIPtr&,
+                   int, const Ice::Context&, const IceUtil::Optional<bool>&);
 
     virtual std::vector<EndpointIPtr> getEndpoints() const;
     virtual std::string getAdapterId() const;
@@ -195,6 +202,7 @@ public:
     virtual Ice::EndpointSelectionType getEndpointSelection() const;
     virtual int getLocatorCacheTimeout() const;
     virtual std::string getConnectionId() const;
+    virtual IceUtil::Optional<int> getTimeout() const;
 
     virtual ReferencePtr changeEndpoints(const std::vector<EndpointIPtr>&) const;
     virtual ReferencePtr changeAdapterId(const std::string&) const;
@@ -208,6 +216,7 @@ public:
 
     virtual ReferencePtr changeTimeout(int) const;
     virtual ReferencePtr changeConnectionId(const std::string&) const;
+    virtual ReferencePtr changeConnection(const Ice::ConnectionIPtr&) const;
 
     virtual bool isIndirect() const;
     virtual bool isWellKnown() const;
@@ -249,6 +258,7 @@ public:
     virtual Ice::EndpointSelectionType getEndpointSelection() const;
     virtual int getLocatorCacheTimeout() const;
     virtual std::string getConnectionId() const;
+    virtual IceUtil::Optional<int> getTimeout() const;
 
     virtual ReferencePtr changeEncoding(const Ice::EncodingVersion&) const;
     virtual ReferencePtr changeCompress(bool) const;
@@ -264,6 +274,7 @@ public:
 
     virtual ReferencePtr changeTimeout(int) const;
     virtual ReferencePtr changeConnectionId(const std::string&) const;
+    virtual ReferencePtr changeConnection(const Ice::ConnectionIPtr&) const;
 
     virtual bool isIndirect() const;
     virtual bool isWellKnown() const;