X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=model.h;h=8e57876dabf3950e9cd3378eb15d50085a044d73;hp=a2d33432de948e4bc64b48ca6d7c1c7596f1a20f;hb=822674ef74d355637bc3ab2dda6fb63322a1f367;hpb=381e2769f94f7e41c1c90d3ab633a37136fa24b0 diff --git a/model.h b/model.h index a2d3343..8e57876 100644 --- a/model.h +++ b/model.h @@ -26,7 +26,7 @@ class CycleGraph; class Promise; /** @brief Shorthand for a list of release sequence heads */ -typedef std::vector< const ModelAction *, MyAlloc > rel_heads_list_t; +typedef std::vector< const ModelAction *, ModelAlloc > rel_heads_list_t; /** * Model checker parameter structure. Holds run-time configuration options for @@ -78,9 +78,7 @@ public: thread_id_t get_next_id(); int get_num_threads(); - - /** @return The currently executing Thread. */ - Thread * get_current_thread() { return scheduler->get_current_thread(); } + Thread * get_current_thread(); int switch_to_master(ModelAction *act); ClockVector * get_cv(thread_id_t tid);