diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2005-07-11 16:41:12 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2005-07-11 16:41:12 +0000 |
| commit | 8ff7c2608eb845c3b6b637f4648ae726a11a158b (patch) | |
| tree | f1dfb4d3a63752357480561fdd94f37692d8eb47 /cppe/src/IceE/ServantManager.cpp | |
| parent | fix some recent changes to build in J2ME (diff) | |
| download | ice-8ff7c2608eb845c3b6b637f4648ae726a11a158b.tar.bz2 ice-8ff7c2608eb845c3b6b637f4648ae726a11a158b.tar.xz ice-8ff7c2608eb845c3b6b637f4648ae726a11a158b.zip | |
Put back IceUtil namespace
Diffstat (limited to 'cppe/src/IceE/ServantManager.cpp')
| -rw-r--r-- | cppe/src/IceE/ServantManager.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cppe/src/IceE/ServantManager.cpp b/cppe/src/IceE/ServantManager.cpp index 739ad8d5fc0..2e3b53b0ff8 100644 --- a/cppe/src/IceE/ServantManager.cpp +++ b/cppe/src/IceE/ServantManager.cpp @@ -23,7 +23,7 @@ void IceInternal::decRef(ServantManager* p) { p->__decRef(); } void IceInternal::ServantManager::addServant(const ObjectPtr& object, const Identity& ident, const string& facet) { - Ice::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(*this); assert(_instance); // Must not be called after destruction. @@ -47,7 +47,7 @@ IceInternal::ServantManager::addServant(const ObjectPtr& object, const Identity& ex.id = identityToString(ident); if(!facet.empty()) { - ex.id += " -f " + Ice::escapeString(facet, ""); + ex.id += " -f " + IceUtil::escapeString(facet, ""); } throw ex; } @@ -68,7 +68,7 @@ IceInternal::ServantManager::removeServant(const Identity& ident, const string& // ObjectPtr servant = 0; - Ice::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(*this); assert(_instance); // Must not be called after destruction. @@ -87,7 +87,7 @@ IceInternal::ServantManager::removeServant(const Identity& ident, const string& ex.id = identityToString(ident); if(!facet.empty()) { - ex.id += " -f " + Ice::escapeString(facet, ""); + ex.id += " -f " + IceUtil::escapeString(facet, ""); } throw ex; } @@ -113,7 +113,7 @@ IceInternal::ServantManager::removeServant(const Identity& ident, const string& FacetMap IceInternal::ServantManager::removeAllFacets(const Identity& ident) { - Ice::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(*this); assert(_instance); // Must not be called after destruction. @@ -150,7 +150,7 @@ IceInternal::ServantManager::removeAllFacets(const Identity& ident) ObjectPtr IceInternal::ServantManager::findServant(const Identity& ident, const string& facet) const { - Ice::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(*this); assert(_instance); // Must not be called after destruction. @@ -178,7 +178,7 @@ IceInternal::ServantManager::findServant(const Identity& ident, const string& fa FacetMap IceInternal::ServantManager::findAllFacets(const Identity& ident) const { - Ice::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(*this); assert(_instance); // Must not be called after destruction. @@ -205,7 +205,7 @@ IceInternal::ServantManager::findAllFacets(const Identity& ident) const bool IceInternal::ServantManager::hasServant(const Identity& ident) const { - Ice::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(*this); assert(_instance); // Must not be called after destruction. @@ -252,7 +252,7 @@ IceInternal::ServantManager::destroy() ServantMapMap servantMapMap; { - Ice::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(*this); assert(_instance); // Must not be called after destruction. |