model: remove <list> include

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 3f1103e543fa987164cc8d75f7c0c92779a6ff86..9665fa42b1a03a2b731f3f26ad4a28f852289eb3 100644 (file)
--- a/model.h
+++ b/model.h
@@ -5,7 +5,6 @@
 #ifndef __MODEL_H__
 #define __MODEL_H__
 
-#include <list>
 #include <vector>
 #include <cstddef>
 #include <ucontext.h>
@@ -111,11 +110,11 @@ public:
 
        thread_id_t get_next_id();
        unsigned int get_num_threads() const;
-       Thread * get_current_thread();
+       Thread * get_current_thread() const;
 
        int switch_to_master(ModelAction *act);
-       ClockVector * get_cv(thread_id_t tid);
-       ModelAction * get_parent_action(thread_id_t tid);
+       ClockVector * get_cv(thread_id_t tid) const;
+       ModelAction * get_parent_action(thread_id_t tid) const;
        void check_promises_thread_disabled();
        void mo_check_promises(thread_id_t tid, const ModelAction *write);
        void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector * merge_cv);
@@ -128,7 +127,7 @@ public:
        void set_bad_synchronization();
 
        const model_params params;
-       Node * get_curr_node();
+       Node * get_curr_node() const;
 
        MEMALLOC
 private:
@@ -243,7 +242,7 @@ private:
        struct execution_stats stats;
        void record_stats();
 
-       bool isfinalfeasible() const;
+       bool is_feasible_prefix_ignore_relseq() const;
        bool is_infeasible_ignoreRMW() const;
        bool is_infeasible() const;
        bool is_deadlocked() const;