# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 2008-07-23 17:51:07
# Node ID 9ce7a01a95c7e5faa01c80e6697dad0e2d863291
# Parent  aebc0161f6e5bb7f9c0d157ed517e8ac4cbeb763
# Parent  af4e8ba94294a7854bd448deb64744cef238dcf4

Merge

diff --git a/lemon/bits/alteration_notifier.h b/lemon/bits/alteration_notifier.h
--- a/lemon/bits/alteration_notifier.h
+++ b/lemon/bits/alteration_notifier.h
@@ -409,9 +409,9 @@
           (*it)->erase(item);
           ++it;
         } catch (const ImmediateDetach&) {
-          it = _observers.erase(it);
           (*it)->_index = _observers.end();
           (*it)->_notifier = 0;
+          it = _observers.erase(it);
         }
       }
     }
@@ -429,9 +429,9 @@
           (*it)->erase(items);
           ++it;
         } catch (const ImmediateDetach&) {
-          it = _observers.erase(it);
           (*it)->_index = _observers.end();
           (*it)->_notifier = 0;
+          it = _observers.erase(it);
         }
       }
     }
@@ -468,9 +468,9 @@
           (*it)->clear();
           ++it;
         } catch (const ImmediateDetach&) {
-          it = _observers.erase(it);
           (*it)->_index = _observers.end();
           (*it)->_notifier = 0;
+          it = _observers.erase(it);
         }
       }
     }