diff options
| author | Bernard Normier <bernard@zeroc.com> | 2003-05-09 19:58:42 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2003-05-09 19:58:42 +0000 |
| commit | 576c135ffea8e4e2ac6c45620d66bf8fcd615601 (patch) | |
| tree | 34799f3700070d726058090290eb2dcee0e85ee3 /cpp/src/Ice/FactoryTableDef.cpp | |
| parent | shutdownOnInterrupt is now the default (diff) | |
| download | ice-576c135ffea8e4e2ac6c45620d66bf8fcd615601.tar.bz2 ice-576c135ffea8e4e2ac6c45620d66bf8fcd615601.tar.xz ice-576c135ffea8e4e2ac6c45620d66bf8fcd615601.zip | |
Changed library names on Windows for Ice 1.1
Diffstat (limited to 'cpp/src/Ice/FactoryTableDef.cpp')
| -rw-r--r-- | cpp/src/Ice/FactoryTableDef.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/cpp/src/Ice/FactoryTableDef.cpp b/cpp/src/Ice/FactoryTableDef.cpp index 5382babacdf..e1eedd3a35b 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::StaticMutex::Lock lock(_m); + IceUtil::Mutex::Lock lock(_m); EFTable::iterator i = _eft.find(t); if(i == _eft.end()) { @@ -39,7 +39,7 @@ Ice::FactoryTableDef::addExceptionFactory(const std::string& t, const UserExcept } else { - i->second.second++; + i->second.second++;
} } @@ -49,7 +49,7 @@ Ice::FactoryTableDef::addExceptionFactory(const std::string& t, const UserExcept Ice::UserExceptionFactoryPtr Ice::FactoryTableDef::getExceptionFactory(const std::string& t) const { - IceUtil::StaticMutex::Lock lock(_m); + IceUtil::Mutex::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::StaticMutex::Lock lock(_m); + IceUtil::Mutex::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::StaticMutex::Lock lock(_m); + IceUtil::Mutex::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::StaticMutex::Lock lock(_m); + IceUtil::Mutex::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::StaticMutex::Lock lock(_m); + IceUtil::Mutex::Lock lock(_m); OFTable::iterator i = _oft.find(t); if(i != _oft.end()) { @@ -166,5 +166,6 @@ Ice::FactoryTableWrapper::finalize() delete factoryTable; } } - +
+IceUtil::StaticMutex Ice::FactoryTableWrapper::_m = ICE_STATIC_MUTEX_INITIALIZER; int Ice::FactoryTableWrapper::_initCount = 0; // Initialization count |