more allocation fixes (use snapshotting)

[model-checker.git] / model.cc

diff --git a/model.cc b/model.cc
index 8da05aae2be481e348b4b5b9f3de6e08384ff523..62be08746db8ad95fe4aa09283c2f2034250a750 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -5,7 +5,6 @@
 #include "nodestack.h"
 #include "schedule.h"
 #include "snapshot-interface.h"
-#undef DEBUG
 #include "common.h"
 
 #define INITIAL_THREAD_ID      0
@@ -32,7 +31,7 @@ ModelChecker::ModelChecker()
 
 ModelChecker::~ModelChecker()
 {
-       std::map<int, class Thread *, std::less< int >, MyAlloc< std::pair< int, class Thread * > > >::iterator it;
+       std::map<int, class Thread *>::iterator it;
        for (it = thread_map.begin(); it != thread_map.end(); it++)
                delete (*it).second;
        thread_map.clear();
@@ -46,7 +45,7 @@ ModelChecker::~ModelChecker()
 void ModelChecker::reset_to_initial_state()
 {
        DEBUG("+++ Resetting to initial state +++\n");
-       std::map<int, class Thread *, std::less< int >, MyAlloc< std::pair< int, class Thread * > > >::iterator it;
+       std::map<int, class Thread *>::iterator it;
        for (it = thread_map.begin(); it != thread_map.end(); it++)
                delete (*it).second;
        thread_map.clear();