X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.h;h=c069cab3a3c5c3a7e6804498a2f6262b753a6f20;hb=1d6c949fef3b5da936f8499dde464f8df634267a;hp=508ad169478135a96110573b489b2fa4cdcfa7bf;hpb=e759b60e0b2dc31623ba3b03303a9d0d204fdd4c;p=model-checker.git diff --git a/action.h b/action.h index 508ad16..c069cab 100644 --- a/action.h +++ b/action.h @@ -2,10 +2,9 @@ #define __ACTION_H__ #include - #include "threads.h" #include "libatomic.h" - +#include "mymemory.h" #define VALUE_NONE -1 typedef enum action_type { @@ -40,6 +39,7 @@ public: bool same_var(ModelAction *act); bool same_thread(ModelAction *act); bool is_dependent(ModelAction *act); + MEMALLOC private: action_type type; memory_order order; @@ -50,6 +50,6 @@ private: int seq_number; }; -typedef std::list action_list_t; +typedef std::list > action_list_t; #endif /* __ACTION_H__ */