From ae282ff1c3b9669496af3308e0f7889658f564cc Mon Sep 17 00:00:00 2001
From: Chris Dyer <cdyer@Chriss-MacBook-Air.local>
Date: Mon, 11 Nov 2013 16:05:32 -0500
Subject: fix iterator misuse

---
 utils/atools.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'utils')

diff --git a/utils/atools.cc b/utils/atools.cc
index 1726c4ac..559eadef 100644
--- a/utils/atools.cc
+++ b/utils/atools.cc
@@ -203,14 +203,16 @@ struct RefineCommand : public Command {
     bool keep_going = !p.empty();
     while (keep_going) {
       keep_going = false;
-      for (set<pair<int, int> >::iterator pi = p.begin();
-           pi != p.end(); ++pi) {
+      set<pair<int, int> > added;
+      for (set<pair<int, int> >::iterator pi = p.begin(); pi != p.end(); ++pi) {
         if ((this->*pred)(pi->first, pi->second)) {
           Align(pi->first, pi->second);
-          p.erase(pi);
+          added.insert(make_pair(pi->first, pi->second));
           keep_going = true;
         }
       }
+      for (set<pair<int, int> >::iterator ai = added.begin(); ai != added.end(); ++ai)
+        p.erase(*ai);
     }
   }
   Array2D<bool> res_;  // refined alignment
-- 
cgit v1.2.3