summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ObjectAdapterFactory.cpp
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2001-12-27 18:38:22 +0000
committerMatthew Newhook <matthew@zeroc.com>2001-12-27 18:38:22 +0000
commitca2b7f71b4133faf486a677b3744904c0f759471 (patch)
tree2ea5e06f611c338f8160a0c3bd36d069118926fe /cpp/src/Ice/ObjectAdapterFactory.cpp
parentfile run.py was initially added on branch IceThread. (diff)
downloadice-ca2b7f71b4133faf486a677b3744904c0f759471.tar.bz2
ice-ca2b7f71b4133faf486a677b3744904c0f759471.tar.xz
ice-ca2b7f71b4133faf486a677b3744904c0f759471.zip
IceThread merge.
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterFactory.cpp')
-rw-r--r--cpp/src/Ice/ObjectAdapterFactory.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp
index 03336cf2ff1..9863d819011 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.cpp
+++ b/cpp/src/Ice/ObjectAdapterFactory.cpp
@@ -25,7 +25,7 @@ void IceInternal::decRef(ObjectAdapterFactory* p) { p->__decRef(); }
void
IceInternal::ObjectAdapterFactory::shutdown()
{
- JTCSyncT<JTCMutex> sync(*this);
+ IceUtil::Mutex::Lock sync(*this);
for_each(_adapters.begin(), _adapters.end(),
Ice::secondVoidMemFun<string, ObjectAdapter>(&ObjectAdapter::deactivate));
_adapters.clear();
@@ -34,7 +34,7 @@ IceInternal::ObjectAdapterFactory::shutdown()
ObjectAdapterPtr
IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const string& endpts)
{
- JTCSyncT<JTCMutex> sync(*this);
+ IceUtil::Mutex::Lock sync(*this);
map<string, ObjectAdapterIPtr>::iterator p = _adapters.find(name);
if (p != _adapters.end())
{