diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Freeze/EvictorI.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterFactory.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterFactory.h | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp index 8b62746a91f..88a35b81f80 100644 --- a/cpp/src/Freeze/EvictorI.cpp +++ b/cpp/src/Freeze/EvictorI.cpp @@ -402,6 +402,7 @@ Freeze::EvictorI::evict() // // Remove last unused element from the evictor queue. // + assert(--(p.base()) == element->position); p = list<Identity>::reverse_iterator(_evictorList.erase(element->position)); _evictorMap.erase(q); diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp index 0f5a1b52c13..ce5246d7443 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.cpp +++ b/cpp/src/Ice/ObjectAdapterFactory.cpp @@ -23,7 +23,7 @@ void IceInternal::decRef(ObjectAdapterFactory* p) { p->__decRef(); } void IceInternal::ObjectAdapterFactory::shutdown() { - IceUtil::RecMutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(*this); for_each(_adapters.begin(), _adapters.end(), Ice::secondVoidMemFun<string, ObjectAdapter>(&ObjectAdapter::deactivate)); @@ -34,7 +34,7 @@ IceInternal::ObjectAdapterFactory::shutdown() ObjectAdapterPtr IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const string& endpts) { - IceUtil::RecMutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(*this); map<string, ObjectAdapterIPtr>::iterator p = _adapters.find(name); if(p != _adapters.end()) @@ -50,7 +50,7 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const ObjectAdapterPtr IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy) { - IceUtil::RecMutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(*this); for(map<string, ObjectAdapterIPtr>::iterator p = _adapters.begin(); p != _adapters.end(); ++p) { diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h index 737dc1411d7..cc23a3263a0 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.h +++ b/cpp/src/Ice/ObjectAdapterFactory.h @@ -12,12 +12,12 @@ #define ICE_OBJECT_ADAPTER_FACTORY_H #include <Ice/ObjectAdapterI.h> -#include <IceUtil/RecMutex.h> +#include <IceUtil/Mutex.h> namespace IceInternal { -class ObjectAdapterFactory : public ::IceUtil::Shared, public ::IceUtil::RecMutex +class ObjectAdapterFactory : public ::IceUtil::Shared, public ::IceUtil::Mutex { public: |