diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/IceGrid/Database.cpp | 10 | ||||
| -rw-r--r-- | cpp/src/IceGrid/LocatorI.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/IceGrid/session/AllTests.cpp | 8 |
3 files changed, 10 insertions, 10 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!!! diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp index e54d0681d04..0558e6928e0 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/AllTests.cpp @@ -95,13 +95,13 @@ public: { this->applications.insert(make_pair(p->name, *p)); } - for(AdapterInfoSeq::const_iterator p = adapters.begin(); p != adapters.end(); ++p) + for(AdapterInfoSeq::const_iterator q = adapters.begin(); q != adapters.end(); ++q) { - this->adapters.insert(make_pair(p->id, *p)); + this->adapters.insert(make_pair(q->id, *q)); } - for(ObjectInfoSeq::const_iterator p = objects.begin(); p != objects.end(); ++p) + for(ObjectInfoSeq::const_iterator r = objects.begin(); r != objects.end(); ++r) { - this->objects.insert(make_pair(p->proxy->ice_getIdentity(), *p)); + this->objects.insert(make_pair(r->proxy->ice_getIdentity(), *r)); } updated(serial); } |