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/LocatorInfo.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/LocatorInfo.cpp')
| -rw-r--r-- | cpp/src/Ice/LocatorInfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp index 32ac46b7b78..358ec4fe298 100644 --- a/cpp/src/Ice/LocatorInfo.cpp +++ b/cpp/src/Ice/LocatorInfo.cpp @@ -48,7 +48,7 @@ IceInternal::LocatorManager::destroy() { IceUtil::Mutex::Lock sync(*this); - for_each(_table.begin(), _table.end(), Ice::secondVoidMemFun<LocatorPrx, LocatorInfo>(&LocatorInfo::destroy)); + for_each(_table.begin(), _table.end(), Ice::secondVoidMemFun<const LocatorPrx, LocatorInfo>(&LocatorInfo::destroy)); _table.clear(); _tableHint = _table.end(); @@ -98,10 +98,10 @@ IceInternal::LocatorManager::get(const LocatorPrx& loc) if(t == _locatorTables.end()) { t = _locatorTables.insert(_locatorTables.begin(), - make_pair(locator->ice_getIdentity(), new LocatorTable())); + pair<const Identity, LocatorTablePtr>(locator->ice_getIdentity(), new LocatorTable())); } - _tableHint = _table.insert(_tableHint, make_pair(locator, new LocatorInfo(locator, t->second))); + _tableHint = _table.insert(_tableHint, pair<const LocatorPrx, LocatorInfoPtr>(locator, new LocatorInfo(locator, t->second))); } else { |