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/ObjectAdapterFactory.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/ObjectAdapterFactory.cpp')
| -rw-r--r-- | cppe/src/IceE/ObjectAdapterFactory.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cppe/src/IceE/ObjectAdapterFactory.cpp b/cppe/src/IceE/ObjectAdapterFactory.cpp index c42b620657e..033e5ec5192 100644 --- a/cppe/src/IceE/ObjectAdapterFactory.cpp +++ b/cppe/src/IceE/ObjectAdapterFactory.cpp @@ -25,7 +25,7 @@ IceInternal::ObjectAdapterFactory::shutdown() map<string, ObjectAdapterPtr> adapters; { - Ice::Monitor<Ice::Mutex>::Lock sync(*this); + IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); // // Ignore shutdown requests if the object adapter factory has @@ -61,7 +61,7 @@ void IceInternal::ObjectAdapterFactory::waitForShutdown() { { - Ice::Monitor<Ice::Mutex>::Lock sync(*this); + IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); // // First we wait for the shutdown of the factory itself. @@ -98,7 +98,7 @@ IceInternal::ObjectAdapterFactory::waitForShutdown() _adapters.clear(); { - Ice::Monitor<Ice::Mutex>::Lock sync(*this); + IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); // // Signal that waiting is complete. @@ -111,7 +111,7 @@ IceInternal::ObjectAdapterFactory::waitForShutdown() ObjectAdapterPtr IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name) { - Ice::Monitor<Ice::Mutex>::Lock sync(*this); + IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); if(!_instance) { @@ -132,7 +132,7 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name) ObjectAdapterPtr IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy) { - Ice::Monitor<Ice::Mutex>::Lock sync(*this); + IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); if(!_instance) { @@ -174,7 +174,7 @@ IceInternal::ObjectAdapterFactory::flushBatchRequests() const { list<ObjectAdapterPtr> a; { - Ice::Monitor<Ice::Mutex>::Lock sync(*this); + IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); for(map<string, ObjectAdapterPtr>::const_iterator p = _adapters.begin(); p != _adapters.end(); ++p) { |