1 files changed, 38 insertions, 38 deletions

diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 5cf7e2a55be..18f71b1f0be 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -45,19 +45,19 @@ IceInternal::checkedCast(const ObjectPrx& b, const string& f, ObjectPrx& d)
     d = 0;
     if (b)
     {
-	if (f == b->_getFacet())
+	if (f == b->_ice_getFacet())
 	{
 	    d = b;
 	}
 	else
 	{
-	    ObjectPrx bb = b->_newFacet(f);
+	    ObjectPrx bb = b->_ice_newFacet(f);
 	    try
 	    {
 #ifdef NDEBUG
-		bb->_isA("::Ice::Object");
+		bb->_ice_isA("::Ice::Object");
 #else
-		bool ok = bb->_isA("::Ice::Object");
+		bool ok = bb->_ice_isA("::Ice::Object");
 		assert(ok);
 #endif
 		d = bb;
@@ -75,7 +75,7 @@ IceInternal::uncheckedCast(const ObjectPrx& b, const string& f, ObjectPrx& d)
     d = 0;
     if (b)
     {
-	d = b->_newFacet(f);
+	d = b->_ice_newFacet(f);
     }
 }
 
@@ -92,12 +92,12 @@ IceProxy::Ice::Object::operator<(const Object& r) const
 }
 
 Int
-IceProxy::Ice::Object::_hash() const
+IceProxy::Ice::Object::_ice_hash() const
 {
     return _reference->hashValue;
 }
 bool
-IceProxy::Ice::Object::_isA(const string& s)
+IceProxy::Ice::Object::_ice_isA(const string& s)
 {
     int __cnt = 0;
     while (true)
@@ -105,7 +105,7 @@ IceProxy::Ice::Object::_isA(const string& s)
 	try
 	{
 	    Handle< ::IceDelegate::Ice::Object> __del = __getDelegate();
-	    return __del->_isA(s);
+	    return __del->_ice_isA(s);
 	}
 	catch (const LocationForward& __ex)
 	{
@@ -123,7 +123,7 @@ IceProxy::Ice::Object::_isA(const string& s)
 }
 
 void
-IceProxy::Ice::Object::_ping()
+IceProxy::Ice::Object::_ice_ping()
 {
     int __cnt = 0;
     while (true)
@@ -131,7 +131,7 @@ IceProxy::Ice::Object::_ping()
 	try
 	{
 	    Handle< ::IceDelegate::Ice::Object> __del = __getDelegate();
-	    __del->_ping();
+	    __del->_ice_ping();
 	    return;
 	}
 	catch (const LocationForward& __ex)
@@ -150,13 +150,13 @@ IceProxy::Ice::Object::_ping()
 }
 
 std::string
-IceProxy::Ice::Object::_getIdentity() const
+IceProxy::Ice::Object::_ice_getIdentity() const
 {
     return _reference->identity;
 }
 
 ObjectPrx
-IceProxy::Ice::Object::_newIdentity(const std::string& newIdentity) const
+IceProxy::Ice::Object::_ice_newIdentity(const std::string& newIdentity) const
 {
     if (newIdentity == _reference->identity)
     {
@@ -171,13 +171,13 @@ IceProxy::Ice::Object::_newIdentity(const std::string& newIdentity) const
 }
 
 std::string
-IceProxy::Ice::Object::_getFacet() const
+IceProxy::Ice::Object::_ice_getFacet() const
 {
     return _reference->facet;
 }
 
 ObjectPrx
-IceProxy::Ice::Object::_newFacet(const std::string& newFacet) const
+IceProxy::Ice::Object::_ice_newFacet(const std::string& newFacet) const
 {
     if (newFacet == _reference->facet)
     {
@@ -192,7 +192,7 @@ IceProxy::Ice::Object::_newFacet(const std::string& newFacet) const
 }
 
 ObjectPrx
-IceProxy::Ice::Object::_twoway() const
+IceProxy::Ice::Object::_ice_twoway() const
 {
     ReferencePtr ref = _reference->changeMode(Reference::ModeTwoway);
     if (ref == _reference)
@@ -208,7 +208,7 @@ IceProxy::Ice::Object::_twoway() const
 }
 
 ObjectPrx
-IceProxy::Ice::Object::_oneway() const
+IceProxy::Ice::Object::_ice_oneway() const
 {
     ReferencePtr ref = _reference->changeMode(Reference::ModeOneway);
     if (ref == _reference)
@@ -224,7 +224,7 @@ IceProxy::Ice::Object::_oneway() const
 }
 
 ObjectPrx
-IceProxy::Ice::Object::_batchOneway() const
+IceProxy::Ice::Object::_ice_batchOneway() const
 {
     ReferencePtr ref = _reference->changeMode(Reference::ModeBatchOneway);
     if (ref == _reference)
@@ -240,7 +240,7 @@ IceProxy::Ice::Object::_batchOneway() const
 }
 
 ObjectPrx
-IceProxy::Ice::Object::_datagram() const
+IceProxy::Ice::Object::_ice_datagram() const
 {
     ReferencePtr ref = _reference->changeMode(Reference::ModeDatagram);
     if (ref == _reference)
@@ -256,7 +256,7 @@ IceProxy::Ice::Object::_datagram() const
 }
 
 ObjectPrx
-IceProxy::Ice::Object::_batchDatagram() const
+IceProxy::Ice::Object::_ice_batchDatagram() const
 {
     ReferencePtr ref = _reference->changeMode(Reference::ModeBatchDatagram);
     if (ref == _reference)
@@ -272,7 +272,7 @@ IceProxy::Ice::Object::_batchDatagram() const
 }
 
 ObjectPrx
-IceProxy::Ice::Object::_secure(bool b) const
+IceProxy::Ice::Object::_ice_secure(bool b) const
 {
     ReferencePtr ref = _reference->changeSecure(b);
     if (ref == _reference)
@@ -288,7 +288,7 @@ IceProxy::Ice::Object::_secure(bool b) const
 }
 
 ObjectPrx
-IceProxy::Ice::Object::_timeout(int t) const
+IceProxy::Ice::Object::_ice_timeout(int t) const
 {
     ReferencePtr ref = _reference->changeTimeout(t);
     if (ref == _reference)
@@ -304,10 +304,10 @@ IceProxy::Ice::Object::_timeout(int t) const
 }
 
 void
-IceProxy::Ice::Object::_flush()
+IceProxy::Ice::Object::_ice_flush()
 {
     Handle< ::IceDelegate::Ice::Object> __del = __getDelegate();
-    __del->_flush();
+    __del->_ice_flush();
 }
 
 ReferencePtr
@@ -333,7 +333,7 @@ IceProxy::Ice::Object::__handleException(const LocalException& ex, int& cnt)
 
     try
     {
-	ex._throw();
+	ex._ice_throw();
     }
     catch (const CloseConnectionException&)
     {
@@ -367,7 +367,7 @@ IceProxy::Ice::Object::__handleException(const LocalException& ex, int& cnt)
 	    s << "cannot retry operation call because retry limit has been exceeded\n" << ex;
 	    logger->trace(traceLevels->retryCat, s.str());
 	}
-	ex._throw();
+	ex._ice_throw();
     }
 
     if (traceLevels->retry >= 1)
@@ -417,7 +417,7 @@ IceProxy::Ice::Object::__rethrowException(const LocalException& ex)
 
     _delegate = 0;
 
-    ex._throw();
+    ex._ice_throw();
 }
 
 Handle< ::IceDelegate::Ice::Object>
@@ -467,12 +467,12 @@ IceProxy::Ice::Object::setup(const ReferencePtr& ref)
 }
 
 bool
-IceDelegateM::Ice::Object::_isA(const string& s)
+IceDelegateM::Ice::Object::_ice_isA(const string& s)
 {
     Outgoing __out(__emitter, __reference);
     BasicStream* __is = __out.is();
     BasicStream* __os = __out.os();
-    __os->write("_isA");
+    __os->write("_ice_isA");
     __os->write(s);
     if (!__out.invoke())
     {
@@ -484,11 +484,11 @@ IceDelegateM::Ice::Object::_isA(const string& s)
 }
 
 void
-IceDelegateM::Ice::Object::_ping()
+IceDelegateM::Ice::Object::_ice_ping()
 {
     Outgoing __out(__emitter, __reference);
     BasicStream* __os = __out.os();
-    __os->write("_ping");
+    __os->write("_ice_ping");
     if (!__out.invoke())
     {
 	throw ::Ice::UnknownUserException(__FILE__, __LINE__);
@@ -496,7 +496,7 @@ IceDelegateM::Ice::Object::_ping()
 }
 
 void
-IceDelegateM::Ice::Object::_flush()
+IceDelegateM::Ice::Object::_ice_flush()
 {
     __emitter->flushBatchRequest();
 }
@@ -555,21 +555,21 @@ IceDelegateM::Ice::Object::setup(const ReferencePtr& ref)
 }
 
 bool
-IceDelegateD::Ice::Object::_isA(const string& s)
+IceDelegateD::Ice::Object::_ice_isA(const string& s)
 {
-    Direct __direct(__adapter, __reference, "_isA");
-    return __direct.facetServant()->_isA(s);
+    Direct __direct(__adapter, __reference, "_ice_isA");
+    return __direct.facetServant()->_ice_isA(s);
 }
 
 void
-IceDelegateD::Ice::Object::_ping()
+IceDelegateD::Ice::Object::_ice_ping()
 {
-    Direct __direct(__adapter, __reference, "_ping");
-    __direct.facetServant()->_ping();
+    Direct __direct(__adapter, __reference, "_ice_ping");
+    __direct.facetServant()->_ice_ping();
 }
 
 void
-IceDelegateD::Ice::Object::_flush()
+IceDelegateD::Ice::Object::_ice_flush()
 {
     // Nothing to do for direct delegates
 }