summaryrefslogtreecommitdiff
path: root/cppe/src/IceE/Proxy.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2005-07-11 16:41:12 +0000
committerDwayne Boone <dwayne@zeroc.com>2005-07-11 16:41:12 +0000
commit8ff7c2608eb845c3b6b637f4648ae726a11a158b (patch)
treef1dfb4d3a63752357480561fdd94f37692d8eb47 /cppe/src/IceE/Proxy.cpp
parentfix some recent changes to build in J2ME (diff)
downloadice-8ff7c2608eb845c3b6b637f4648ae726a11a158b.tar.bz2
ice-8ff7c2608eb845c3b6b637f4648ae726a11a158b.tar.xz
ice-8ff7c2608eb845c3b6b637f4648ae726a11a158b.zip
Put back IceUtil namespace
Diffstat (limited to 'cppe/src/IceE/Proxy.cpp')
-rw-r--r--cppe/src/IceE/Proxy.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cppe/src/IceE/Proxy.cpp b/cppe/src/IceE/Proxy.cpp
index 8bca4ad0848..e972b00ccdb 100644
--- a/cppe/src/IceE/Proxy.cpp
+++ b/cppe/src/IceE/Proxy.cpp
@@ -558,7 +558,7 @@ IceProxy::Ice::Object::__copyFrom(const ObjectPrx& from)
::IceInternal::Handle< ::IceDelegate::Ice::Object> delegate;
{
- ::Ice::Mutex::Lock sync(*from.get());
+ ::IceUtil::Mutex::Lock sync(*from.get());
ref = from->_reference;
delegate = dynamic_cast< ::IceDelegate::Ice::Object*>(from->_delegate.get());
@@ -588,7 +588,7 @@ IceProxy::Ice::Object::__handleException(const LocalException& ex, int& cnt)
// Only _delegate needs to be mutex protected here.
//
{
- ::Ice::Mutex::Lock sync(*this);
+ ::IceUtil::Mutex::Lock sync(*this);
_delegate = 0;
}
@@ -613,7 +613,7 @@ IceProxy::Ice::Object::__rethrowException(const LocalException& ex)
// Only _delegate needs to be mutex protected here.
//
{
- ::Ice::Mutex::Lock sync(*this);
+ ::IceUtil::Mutex::Lock sync(*this);
_delegate = 0;
}
@@ -639,7 +639,7 @@ IceProxy::Ice::Object::__checkTwowayOnly(const char* name) const
::IceInternal::Handle< ::IceDelegate::Ice::Object>
IceProxy::Ice::Object::__getDelegate()
{
- ::Ice::Mutex::Lock sync(*this);
+ ::IceUtil::Mutex::Lock sync(*this);
if(!_delegate)
{