diff options
author | Benoit Foucher <benoit@zeroc.com> | 2006-09-26 15:09:27 +0000 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2006-09-26 15:09:27 +0000 |
commit | 24d873adfe169dcdf369fa1e4827503e8a8a027e (patch) | |
tree | ed3114c6cc564aadf4aae786fa41def2d6ef921c /cpp/src | |
parent | Fixes to allow upgrade of a slave to a master (diff) | |
download | ice-24d873adfe169dcdf369fa1e4827503e8a8a027e.tar.bz2 ice-24d873adfe169dcdf369fa1e4827503e8a8a027e.tar.xz ice-24d873adfe169dcdf369fa1e4827503e8a8a027e.zip |
Fix
Diffstat (limited to 'cpp/src')
-rw-r--r-- | cpp/src/IceGrid/RegistryI.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index 1cc700491eb..6bfd2bad9c6 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -274,10 +274,11 @@ RegistryI::start(bool nowarn) // database. // Ice::ObjectProxySeq proxies; + Ice::ObjectProxySeq::const_iterator p; NodePrxSeq nodes; proxies = _database->getInternalObjectsByType(Node::ice_staticId()); - for(Ice::ObjectProxySeq::const_iterator p = proxies.begin(); p != proxies.end(); ++p) + for(p = proxies.begin(); p != proxies.end(); ++p) { nodes.push_back(NodePrx::uncheckedCast(*p)); _database->removeInternalObject((*p)->ice_getIdentity()); @@ -285,7 +286,7 @@ RegistryI::start(bool nowarn) InternalRegistryPrxSeq replicas; proxies = _database->getObjectsByType(InternalRegistry::ice_staticId()); - for(Ice::ObjectProxySeq::const_iterator p = proxies.begin(); p != proxies.end(); ++p) + for(p = proxies.begin(); p != proxies.end(); ++p) { replicas.push_back(InternalRegistryPrx::uncheckedCast(*p)); _database->removeObject((*p)->ice_getIdentity()); |