X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=c97cbf1a05f905fb79087c21b91401548b5ecf2e;hb=d70f6f259c9850e5fceb527e3a9541c440c0146b;hp=8345678fab7f0724a2a4dd7f638470d84bb46483;hpb=5e4e1eebcf9a6248ba9227d7f486ad1fe2a2d3d1;p=model-checker.git

diff --git a/model.h b/model.h
index 8345678..c97cbf1 100644
--- a/model.h
+++ b/model.h
@@ -148,7 +148,7 @@ private:
 
 	bool next_execution();
 	void set_current_action(ModelAction *act);
-	Thread * check_current_action(ModelAction *curr);
+	ModelAction * check_current_action(ModelAction *curr);
 	bool initialize_curr_action(ModelAction **curr);
 	bool process_read(ModelAction *curr, bool second_part_of_rmw);
 	bool process_write(ModelAction *curr);
@@ -165,6 +165,7 @@ private:
 	ModelAction * get_last_conflict(ModelAction *act);
 	void set_backtracking(ModelAction *act);
 	Thread * get_next_thread(ModelAction *curr);
+	bool set_latest_backtrack(ModelAction *act);
 	ModelAction * get_next_backtrack();
 	void reset_to_initial_state();
 	bool resolve_promises(ModelAction *curr);