diff options
| author | Michi Henning <michi@zeroc.com> | 2003-05-08 07:25:27 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2003-05-08 07:25:27 +0000 |
| commit | ea8bdaa909604d74cca0a50d9256958476059bb1 (patch) | |
| tree | 9f07b5371224a14df6fe868c545567af4f82d24a /cpp/src/Ice/FactoryTableDef.cpp | |
| parent | Fixed incorrect scope for passing function pointer for __patch__ObjectPtr. (diff) | |
| download | ice-ea8bdaa909604d74cca0a50d9256958476059bb1.tar.bz2 ice-ea8bdaa909604d74cca0a50d9256958476059bb1.tar.xz ice-ea8bdaa909604d74cca0a50d9256958476059bb1.zip | |
Slicing updates for Windows port.
Diffstat (limited to 'cpp/src/Ice/FactoryTableDef.cpp')
| -rw-r--r-- | cpp/src/Ice/FactoryTableDef.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/Ice/FactoryTableDef.cpp b/cpp/src/Ice/FactoryTableDef.cpp index 3d294fa015b..5382babacdf 100644 --- a/cpp/src/Ice/FactoryTableDef.cpp +++ b/cpp/src/Ice/FactoryTableDef.cpp @@ -31,7 +31,7 @@ ICE_API FactoryTableDef* factoryTable; // Single global instance of the factory void Ice::FactoryTableDef::addExceptionFactory(const std::string& t, const UserExceptionFactoryPtr& f) { - IceUtil::LockT<IceUtil::Mutex> lock(_m); + IceUtil::StaticMutex::Lock lock(_m); EFTable::iterator i = _eft.find(t); if(i == _eft.end()) { @@ -49,7 +49,7 @@ Ice::FactoryTableDef::addExceptionFactory(const std::string& t, const UserExcept Ice::UserExceptionFactoryPtr Ice::FactoryTableDef::getExceptionFactory(const std::string& t) const { - IceUtil::LockT<IceUtil::Mutex> lock(_m); + IceUtil::StaticMutex::Lock lock(_m); EFTable::const_iterator i = _eft.find(t); return i != _eft.end() ? i->second.first : UserExceptionFactoryPtr(); } @@ -63,7 +63,7 @@ Ice::FactoryTableDef::getExceptionFactory(const std::string& t) const void Ice::FactoryTableDef::removeExceptionFactory(const std::string& t) { - IceUtil::LockT<IceUtil::Mutex> lock(_m); + IceUtil::StaticMutex::Lock lock(_m); EFTable::iterator i = _eft.find(t); if(i != _eft.end()) { @@ -80,7 +80,7 @@ Ice::FactoryTableDef::removeExceptionFactory(const std::string& t) void Ice::FactoryTableDef::addObjectFactory(const std::string& t, const ObjectFactoryPtr& f) { - IceUtil::LockT<IceUtil::Mutex> lock(_m); + IceUtil::StaticMutex::Lock lock(_m); OFTable::iterator i = _oft.find(t); if(i == _oft.end()) { @@ -98,7 +98,7 @@ Ice::FactoryTableDef::addObjectFactory(const std::string& t, const ObjectFactory Ice::ObjectFactoryPtr Ice::FactoryTableDef::getObjectFactory(const std::string& t) const { - IceUtil::LockT<IceUtil::Mutex> lock(_m); + IceUtil::StaticMutex::Lock lock(_m); OFTable::const_iterator i = _oft.find(t); return i != _oft.end() ? i->second.first : ObjectFactoryPtr(); } @@ -112,7 +112,7 @@ Ice::FactoryTableDef::getObjectFactory(const std::string& t) const void Ice::FactoryTableDef::removeObjectFactory(const std::string& t) { - IceUtil::LockT<IceUtil::Mutex> lock(_m); + IceUtil::StaticMutex::Lock lock(_m); OFTable::iterator i = _oft.find(t); if(i != _oft.end()) { @@ -146,7 +146,7 @@ Ice::FactoryTableWrapper::~FactoryTableWrapper() void Ice::FactoryTableWrapper::initialize() { - IceUtil::LockT<IceUtil::Mutex> lock(_m); + IceUtil::StaticMutex::Lock lock(_m); if(_initCount == 0) { factoryTable = new FactoryTableDef; @@ -160,7 +160,7 @@ Ice::FactoryTableWrapper::initialize() void Ice::FactoryTableWrapper::finalize() { - IceUtil::LockT<IceUtil::Mutex> lock(_m); + IceUtil::StaticMutex::Lock lock(_m); if(--_initCount == 0) { delete factoryTable; |