1 files changed, 37 insertions, 7 deletions

diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 441e69ef7bb..3bfdc14610a 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -54,7 +54,7 @@ IceInternal::checkedCastImpl(const ObjectPrx& b, const string& f, const string&
 
     if(b)
     {
-	ObjectPrx bb = b->ice_newFacet(f);
+	ObjectPrx bb = b->ice_facet(f);
 	try
 	{
 	    if(bb->ice_isA(typeId))
@@ -88,7 +88,7 @@ IceInternal::checkedCastImpl(const ObjectPrx& b, const string& f, const string&
 
     if(b)
     {
-	ObjectPrx bb = b->ice_newFacet(f);
+	ObjectPrx bb = b->ice_facet(f);
 	try
 	{
 	    if(bb->ice_isA(typeId, ctx))
@@ -378,7 +378,7 @@ IceProxy::Ice::Object::ice_getIdentity() const
 }
 
 ObjectPrx
-IceProxy::Ice::Object::ice_newIdentity(const Identity& newIdentity) const
+IceProxy::Ice::Object::ice_identity(const Identity& newIdentity) const
 {
     if(newIdentity == _reference->getIdentity())
     {
@@ -392,6 +392,12 @@ IceProxy::Ice::Object::ice_newIdentity(const Identity& newIdentity) const
     }
 }
 
+ObjectPrx
+IceProxy::Ice::Object::ice_newIdentity(const Identity& newIdentity) const
+{
+    return ice_identity(newIdentity);
+}
+
 Context
 IceProxy::Ice::Object::ice_getContext() const
 {
@@ -399,7 +405,7 @@ IceProxy::Ice::Object::ice_getContext() const
 }
 
 ObjectPrx
-IceProxy::Ice::Object::ice_newContext(const Context& newContext) const
+IceProxy::Ice::Object::ice_context(const Context& newContext) const
 {
     ObjectPrx proxy(new ::IceProxy::Ice::Object());
     proxy->setup(_reference->changeContext(newContext));
@@ -407,6 +413,12 @@ IceProxy::Ice::Object::ice_newContext(const Context& newContext) const
 }
 
 ObjectPrx
+IceProxy::Ice::Object::ice_newContext(const Context& newContext) const
+{
+    return ice_context(newContext);
+}
+
+ObjectPrx
 IceProxy::Ice::Object::ice_defaultContext() const
 {
     ObjectPrx proxy(new ::IceProxy::Ice::Object());
@@ -421,7 +433,7 @@ IceProxy::Ice::Object::ice_getFacet() const
 }
 
 ObjectPrx
-IceProxy::Ice::Object::ice_newFacet(const string& newFacet) const
+IceProxy::Ice::Object::ice_facet(const string& newFacet) const
 {
     if(newFacet == _reference->getFacet())
     {
@@ -435,6 +447,12 @@ IceProxy::Ice::Object::ice_newFacet(const string& newFacet) const
     }
 }
 
+ObjectPrx
+IceProxy::Ice::Object::ice_newFacet(const string& newFacet) const
+{
+    return ice_facet(newFacet);
+}
+
 string
 IceProxy::Ice::Object::ice_getAdapterId() const
 {
@@ -442,7 +460,7 @@ IceProxy::Ice::Object::ice_getAdapterId() const
 }
 
 ObjectPrx
-IceProxy::Ice::Object::ice_newAdapterId(const string& newAdapterId) const
+IceProxy::Ice::Object::ice_adapterId(const string& newAdapterId) const
 {
     if(newAdapterId == _reference->getAdapterId())
     {
@@ -456,6 +474,12 @@ IceProxy::Ice::Object::ice_newAdapterId(const string& newAdapterId) const
     }
 }
 
+ObjectPrx
+IceProxy::Ice::Object::ice_newAdapterId(const string& newAdapterId) const
+{
+    return ice_adapterId(newAdapterId);
+}
+
 EndpointSeq
 IceProxy::Ice::Object::ice_getEndpoints() const
 {
@@ -469,7 +493,7 @@ IceProxy::Ice::Object::ice_getEndpoints() const
 }
 
 ObjectPrx
-IceProxy::Ice::Object::ice_newEndpoints(const EndpointSeq& newEndpoints) const
+IceProxy::Ice::Object::ice_endpoints(const EndpointSeq& newEndpoints) const
 {
     vector<EndpointIPtr> endpoints;
     for(EndpointSeq::const_iterator p = newEndpoints.begin(); p != newEndpoints.end(); ++p)
@@ -489,6 +513,12 @@ IceProxy::Ice::Object::ice_newEndpoints(const EndpointSeq& newEndpoints) const
     }
 }
 
+ObjectPrx
+IceProxy::Ice::Object::ice_newEndpoints(const EndpointSeq& newEndpoints) const
+{
+    return ice_endpoints(newEndpoints);
+}
+
 Int
 IceProxy::Ice::Object::ice_getLocatorCacheTimeout() const
 {