summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Proxy.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/Proxy.cpp')
-rw-r--r--cpp/src/Ice/Proxy.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 9957c3b4353..a4353eca0a7 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -164,7 +164,7 @@ IceProxy::Ice::Object::_getIdentity() const
return _reference->identity;
}
-::Ice::ObjectPrx
+ObjectPrx
IceProxy::Ice::Object::_newIdentity(const std::string& newIdentity) const
{
if (newIdentity == _reference->identity)
@@ -185,7 +185,7 @@ IceProxy::Ice::Object::_getFacet() const
return _reference->facet;
}
-::Ice::ObjectPrx
+ObjectPrx
IceProxy::Ice::Object::_newFacet(const std::string& newFacet) const
{
if (newFacet == _reference->facet)
@@ -319,13 +319,13 @@ IceProxy::Ice::Object::__reference() const
}
void
-IceProxy::Ice::Object::__copyFrom(const ::IceProxy::Ice::Object* from)
+IceProxy::Ice::Object::__copyFrom(const ObjectPrx& from)
{
setup(from->__reference());
}
void
-IceProxy::Ice::Object::__copyFromWithFacet(const ::IceProxy::Ice::Object* from, const string& facet)
+IceProxy::Ice::Object::__copyFromWithFacet(const ObjectPrx& from, const string& facet)
{
setup(from->__reference()->changeFacet(facet));
}