hook up the race detector...

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 4ea55903dde4ae3b595ca5a653c22415b50f320a..97e9849f0bbb441c5af72999e3453bc9adbe5745 100644 (file)
--- a/model.h
+++ b/model.h
@@ -30,7 +30,7 @@ public:
        ~ModelChecker();
 
        /** The scheduler to use: tracks the running/ready Threads */
-       class Scheduler *scheduler;
+       Scheduler *scheduler;
 
        /** Stores the context for the main model-checking system thread (call
         * once)
@@ -54,7 +54,7 @@ public:
        modelclock_t get_next_seq_num();
 
        int switch_to_master(ModelAction *act);
-
+       ClockVector * get_cv(thread_id_t tid);
        bool next_execution();
 
        MEMALLOC
@@ -88,10 +88,10 @@ private:
 
        ucontext_t *system_context;
        action_list_t *action_trace;
-       std::map<int, class Thread *> *thread_map;
+       std::map<int, Thread *> *thread_map;
        std::map<void *, std::vector<action_list_t> > *obj_thrd_map;
        std::vector<ModelAction *> *thrd_last_action;
-       class NodeStack *node_stack;
+       NodeStack *node_stack;
        ModelAction *next_backtrack;
 };