Ticket #300: iterator.patch

AHADIC++/Tools/Soft_Cluster_Handler.C

@@ -558 +558 @@
   Single_Transition_Siter  start(stl->begin()),siter;
   if (lighter) {
     if (hadron!=Flavour(kf_none)) {
-      do {
-        if (start->first==hadron) {
-          siter = start;
-          siter--;
-          if ((++siter)!=stl->end()) start++;
-          else return 0.;
-          break;
-        }
-        else start++;
-      } while (start!=stl->end());
+        siter=stl->find(hadron);
+        if (siter == stl->end()) {
+            return 0.;
+        }
+        else {
+            start=siter;
+            start++; // Jump to the next lightest hadron
+        }
     }
     else {
       for (siter=start;siter!=stl->end();siter++) {

AMISIC++/Main/MI_Base.C

@@ -60 +60 @@
   for (String_MI_Base_Map::iterator nbit=s_bases->begin();
        nbit!=s_bases->end();++nbit) {
     if (nbit->first==m_name) {
-      s_bases->erase(nbit--);
+      s_bases->erase(nbit);
       break;
     }
   }