X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=fbf1b3f0909ff3fd67fbb10e905d1c0b7ff9003b;hp=22430378298aaa60c7755e40be665fe68d1bd275;hb=1667e1f8017bd3f4bf5b1ef5712e3156577f99a2;hpb=75ecaf106e4fc0d2ad2f3d82d089cf8a9956e41a

diff --git a/model.h b/model.h
index 22430378..fbf1b3f0 100644
--- 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)
@@ -41,13 +41,6 @@ public:
 	/** @returns the context for the main model-checking system thread */
 	ucontext_t * get_system_context(void) { return system_context; }
 
-	/**
-	 * Stores the ModelAction for the current thread action.  Call this
-	 * immediately before switching from user- to system-context to pass
-	 * data between them.
-	 * @param act The ModelAction created by the user-thread action
-	 */
-	void set_current_action(ModelAction *act) { current_action = act; }
 	void check_current_action(void);
 	void print_summary(void);
 	Thread * schedule_next_thread();
@@ -70,6 +63,14 @@ private:
 	modelclock_t used_sequence_numbers;
 	int num_executions;
 
+	/**
+	 * Stores the ModelAction for the current thread action.  Call this
+	 * immediately before switching from user- to system-context to pass
+	 * data between them.
+	 * @param act The ModelAction created by the user-thread action
+	 */
+	void set_current_action(ModelAction *act) { current_action = act; }
+
 	ModelAction * get_last_conflict(ModelAction *act);
 	void set_backtracking(ModelAction *act);
 	thread_id_t get_next_replay_thread();
@@ -87,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;
 };