summaryrefslogtreecommitdiff
path: root/cpp/src/IceStorm/NodeI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceStorm/NodeI.cpp')
-rw-r--r--cpp/src/IceStorm/NodeI.cpp5
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
{