diff options
| author | Bernard Normier <bernard@zeroc.com> | 2003-04-09 15:03:35 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2003-04-09 15:03:35 +0000 |
| commit | 3cbc97486f02fdd25a532af96146aa956e51e26d (patch) | |
| tree | 49dadb69954c3c3ef6ce87a9320b8c5c7bb714b8 /cpp/src/Ice/ObjectFactoryManager.cpp | |
| parent | adding Strategy.ice (diff) | |
| download | ice-3cbc97486f02fdd25a532af96146aa956e51e26d.tar.bz2 ice-3cbc97486f02fdd25a532af96146aa956e51e26d.tar.xz ice-3cbc97486f02fdd25a532af96146aa956e51e26d.zip | |
Solaris/Sun C++ 5.4 port
Diffstat (limited to 'cpp/src/Ice/ObjectFactoryManager.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectFactoryManager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/ObjectFactoryManager.cpp b/cpp/src/Ice/ObjectFactoryManager.cpp index 8414337507b..75b6381d96d 100644 --- a/cpp/src/Ice/ObjectFactoryManager.cpp +++ b/cpp/src/Ice/ObjectFactoryManager.cpp @@ -31,7 +31,7 @@ IceInternal::ObjectFactoryManager::add(const ObjectFactoryPtr& factory, const st { IceUtil::Mutex::Lock sync(*this); - if( (_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id) + if((_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id) || _factoryMap.find(id) != _factoryMap.end()) { AlreadyRegisteredException ex(__FILE__, __LINE__); @@ -40,7 +40,7 @@ IceInternal::ObjectFactoryManager::add(const ObjectFactoryPtr& factory, const st throw ex; } - _factoryMapHint = _factoryMap.insert(_factoryMapHint, make_pair(id, factory)); + _factoryMapHint = _factoryMap.insert(_factoryMapHint, pair<const string, ObjectFactoryPtr>(id, factory)); } void @@ -125,7 +125,7 @@ IceInternal::ObjectFactoryManager::destroy() { IceUtil::Mutex::Lock sync(*this); for_each(_factoryMap.begin(), _factoryMap.end(), - Ice::secondVoidMemFun<string, ObjectFactory>(&ObjectFactory::destroy)); + Ice::secondVoidMemFun<const string, ObjectFactory>(&ObjectFactory::destroy)); _factoryMap.clear(); _factoryMapHint = _factoryMap.end(); } |