diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/Database.cpp | 10 | ||||
| -rw-r--r-- | cpp/src/IceGrid/LocatorI.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index 65f963b25f8..88269bb0bba 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -195,18 +195,18 @@ Database::setObservers(const RegistryObserverPrx& registryObserver, const NodeOb applications.push_back(p->second); } - for(StringAdapterInfoDict::const_iterator p = _adapters.begin(); p != _adapters.end(); ++p) + for(StringAdapterInfoDict::const_iterator q = _adapters.begin(); q != _adapters.end(); ++q) { - adapters.push_back(p->second); + adapters.push_back(q->second); if(adapters.back().id.empty()) { - adapters.back().id = p->first; + adapters.back().id = q->first; } } - for(IdentityObjectInfoDict::const_iterator p = _objects.begin(); p != _objects.end(); ++p) + for(IdentityObjectInfoDict::const_iterator r = _objects.begin(); r != _objects.end(); ++r) { - objects.push_back(p->second); + objects.push_back(r->second); } } diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp index 84f7c002803..ee19b2c19f1 100644 --- a/cpp/src/IceGrid/LocatorI.cpp +++ b/cpp/src/IceGrid/LocatorI.cpp @@ -396,7 +396,7 @@ LocatorI::getDirectProxyException(const AdapterPrx& adapter, const string& id, c return; } } - catch(const Ice::Exception& ex) + catch(const Ice::Exception&) { // // TODO: Add a warning!!! |