More changes to inconsistent ice_ proxy methods

1 files changed, 25 insertions, 1 deletions

diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 1611c953f29..94e6ce98157 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -131,12 +131,24 @@ IceProxy::Ice::Object::operator<(const Object& r) const
 Int
 IceProxy::Ice::Object::ice_hash() const
 {
+    return ice_getHash();
+}
+
+Int
+IceProxy::Ice::Object::ice_getHash() const
+{
     return _reference->hash();
 }
 
 CommunicatorPtr
 IceProxy::Ice::Object::ice_communicator() const
 {
+    return ice_getCommunicator();
+}
+
+CommunicatorPtr
+IceProxy::Ice::Object::ice_getCommunicator() const
+{
     return _reference->getCommunicator();
 }
 
@@ -651,7 +663,7 @@ IceProxy::Ice::Object::ice_locator(const LocatorPrx& locator) const
 }
 
 bool
-IceProxy::Ice::Object::ice_getCollocationOptimization() const
+IceProxy::Ice::Object::ice_isCollocationOptimized() const
 {
     return _reference->getCollocationOptimization();
 }
@@ -659,6 +671,12 @@ IceProxy::Ice::Object::ice_getCollocationOptimization() const
 ObjectPrx
 IceProxy::Ice::Object::ice_collocationOptimization(bool b) const
 {
+    return ice_collocationOptimized(b);
+}
+
+ObjectPrx
+IceProxy::Ice::Object::ice_collocationOptimized(bool b) const
+{
     if(b == _reference->getCollocationOptimization())
     {
 	return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
@@ -827,6 +845,12 @@ IceProxy::Ice::Object::ice_connectionId(const string& id) const
 ConnectionPtr
 IceProxy::Ice::Object::ice_connection()
 {
+    return ice_getConnection();
+}
+
+ConnectionPtr
+IceProxy::Ice::Object::ice_getConnection()
+{
     int __cnt = 0;
     while(true)
     {