More changes for inconsistent ice_* proxy methods

2 files changed, 25 insertions, 7 deletions

diff --git a/cppe/src/IceE/Proxy.cpp b/cppe/src/IceE/Proxy.cpp
index 3d5aceb24e8..9251c387f3a 100644
--- a/cppe/src/IceE/Proxy.cpp
+++ b/cppe/src/IceE/Proxy.cpp
@@ -147,12 +147,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();
 }
 
@@ -178,7 +190,7 @@ IceProxy::Ice::Object::ice_isA(const string& __id, const Context& __context)
 	{
 	    __checkTwowayOnly("ice_isA");
 	    static const string __operation("ice_isA");
-	    ConnectionPtr __connection = ice_connection();
+	    ConnectionPtr __connection = ice_getConnection();
             Outgoing __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
             BasicStream* __stream = __og.stream();
             try
@@ -250,7 +262,7 @@ IceProxy::Ice::Object::ice_ping(const Context& __context)
 	try
 	{
             static const string __operation("ice_ping");
-	    ConnectionPtr __connection = ice_connection();
+	    ConnectionPtr __connection = ice_getConnection();
             Outgoing __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
             bool __ok = __og.invoke();
             try
@@ -313,7 +325,7 @@ IceProxy::Ice::Object::ice_ids(const Context& __context)
 	{
 	    __checkTwowayOnly("ice_ids");
             static const string __operation("ice_ids");
-	    ConnectionPtr __connection = ice_connection();
+	    ConnectionPtr __connection = ice_getConnection();
             Outgoing __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
             vector<string> __ret;
             bool __ok = __og.invoke();
@@ -378,7 +390,7 @@ IceProxy::Ice::Object::ice_id(const Context& __context)
 	{
 	    __checkTwowayOnly("ice_id");
             static const string __operation("ice_id");
-	    ConnectionPtr __connection = ice_connection();
+	    ConnectionPtr __connection = ice_getConnection();
             Outgoing __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
             string __ret;
             bool __ok = __og.invoke();
@@ -647,6 +659,12 @@ IceProxy::Ice::Object::ice_timeout(int t) const
 ConnectionPtr
 IceProxy::Ice::Object::ice_connection()
 {
+    return ice_getConnection();
+}
+
+ConnectionPtr
+IceProxy::Ice::Object::ice_getConnection()
+{
     ::IceUtil::Mutex::Lock sync(*this);
 
     if(!_connection)
diff --git a/cppe/src/IceE/RouterInfo.cpp b/cppe/src/IceE/RouterInfo.cpp
index 2d338d6909c..0a0f2c439e6 100644
--- a/cppe/src/IceE/RouterInfo.cpp
+++ b/cppe/src/IceE/RouterInfo.cpp
@@ -14,7 +14,7 @@
 #include <IceE/RouterInfo.h>
 #include <IceE/Router.h>
 #include <IceE/LocalException.h>
-#include <IceE/Connection.h> // For ice_connection()->timeout().
+#include <IceE/Connection.h> // For ice_getConnection()->timeout().
 #include <IceE/Functional.h>
 
 using namespace std;
@@ -179,7 +179,7 @@ IceInternal::RouterInfo::getClientProxy()
 	// we must use the same timeout as the already existing
 	// connection.
 	//
-	_clientProxy = _clientProxy->ice_timeout(_router->ice_connection()->timeout());
+	_clientProxy = _clientProxy->ice_timeout(_router->ice_getConnection()->timeout());
     }
 
     return _clientProxy;
@@ -196,7 +196,7 @@ IceInternal::RouterInfo::setClientProxy(const ObjectPrx& clientProxy)
     // In order to avoid creating a new connection to the router, we
     // must use the same timeout as the already existing connection.
     //
-    _clientProxy = _clientProxy->ice_timeout(_router->ice_connection()->timeout());
+    _clientProxy = _clientProxy->ice_timeout(_router->ice_getConnection()->timeout());
 }
 
 ObjectPrx