Changes in src/moleculelist.cpp [a3fded:274d45]

File:

• src/moleculelist.cpp (modified) (5 diffs)

src/moleculelist.cpp

@@ -5 +5 @@
  */
 
+#include "Helpers/MemDebug.hpp"
+
 #include <cstring>
 
@@ -10 +12 @@
 #include "atom.hpp"
 #include "bond.hpp"
-#include "bondgraph.hpp"
 #include "boundary.hpp"
 #include "config.hpp"
@@ -30 +31 @@
  */
 MoleculeListClass::MoleculeListClass(World *_world) :
+  Observable("MoleculeListClass"),
   world(_world)
 {
@@ -210 +212 @@
 
   // put all molecules of src into mol
-  molecule::iterator runner;
-  for (molecule::iterator iter = srcmol->begin(); iter != srcmol->end(); ++iter) {
-    runner = iter++;
-    srcmol->UnlinkAtom((*runner));
-    mol->AddAtom((*runner));
+  for (molecule::iterator iter = srcmol->begin(); !srcmol->empty(); iter=srcmol->begin()) {
+    atom * const Walker = *iter;
+    srcmol->UnlinkAtom(Walker);
+    mol->AddAtom(Walker);
   }
 
@@ -257 +258 @@
     status = status && SimpleMerge(mol, srcmol);
   }
+  insert(mol);
   return status;
 };