diff options
| author | Jose <jose@zeroc.com> | 2012-10-03 14:51:45 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-10-03 14:51:45 +0200 |
| commit | 319a8a2f04aa3dec1eb41f9aa29690bf68bdcfbd (patch) | |
| tree | 6cf6d939c3621633056403ff1d1106949a00b5f0 /cpp/src/IceStorm/NodeI.cpp | |
| parent | Minor C++ fixes (diff) | |
| download | ice-319a8a2f04aa3dec1eb41f9aa29690bf68bdcfbd.tar.bz2 ice-319a8a2f04aa3dec1eb41f9aa29690bf68bdcfbd.tar.xz ice-319a8a2f04aa3dec1eb41f9aa29690bf68bdcfbd.zip | |
ICE-4824 - Fixed VC6 style loops
Diffstat (limited to 'cpp/src/IceStorm/NodeI.cpp')
| -rw-r--r-- | cpp/src/IceStorm/NodeI.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/IceStorm/NodeI.cpp b/cpp/src/IceStorm/NodeI.cpp index f586edcaa86..20da26fdb6b 100644 --- a/cpp/src/IceStorm/NodeI.cpp +++ b/cpp/src/IceStorm/NodeI.cpp @@ -580,8 +580,7 @@ NodeI::mergeContinue() // updates. int maxid = -1; LogUpdate maxllu = { -1, 0 }; - set<GroupNodeInfo>::const_iterator p; - for(p = tmpSet.begin(); p != tmpSet.end(); ++p) + for(set<GroupNodeInfo>::const_iterator p = tmpSet.begin(); p != tmpSet.end(); ++p) { if(_traceLevels->election > 0) { @@ -674,7 +673,7 @@ NodeI::mergeContinue() } // Tell each node to go. - for(p = tmpSet.begin(); p != tmpSet.end(); ++p) + for(set<GroupNodeInfo>::const_iterator p = tmpSet.begin(); p != tmpSet.end(); ++p) { try { |