merging stuff...made need to clean up some stuff...but need to push it somewhere...

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index ffedb18b9c258e23600279c616765cee861ca632..1dc6a158d3aa63247d1051977fe734f1b9cf042f 100644 (file)
--- a/model.h
+++ b/model.h
@@ -51,7 +51,6 @@ private:
 
        ModelAction * get_last_conflict(ModelAction *act);
        void set_backtracking(ModelAction *act);
-       thread_id_t advance_backtracking_state();
        thread_id_t get_next_replay_thread();
        Backtrack * get_next_backtrack();
        void reset_to_initial_state();
@@ -67,7 +66,6 @@ private:
        std::map<int, class Thread *, std::less< int >, MyAlloc< std::pair< const int, class Thread * > > > thread_map;
        class TreeNode *rootNode, *currentNode;
        std::list<class Backtrack *, MyAlloc< class Backtrack * > > backtrack_list;
-       std::vector< std::pair< void *, size_t >, MyAlloc< std::pair< void *, size_t > > > global_vec;
 };
 
 extern ModelChecker *model;