Merge commit: branch 'work'

[model-checker.git] / action.h

diff --git a/action.h b/action.h
index b30b650008194239c363d9948e8db6d882cc1a9b..4cc68479e347e5e50573b074ef625e1d013b73f5 100644 (file)
--- a/action.h
+++ b/action.h
@@ -2,10 +2,9 @@
 #define __ACTION_H__
 
 #include <list>
-
 #include "threads.h"
 #include "libatomic.h"
-
+#include "mymemory.h"
 #define VALUE_NONE -1
 
 typedef enum action_type {
@@ -47,6 +46,7 @@ public:
        inline bool operator >(const ModelAction& act) const {
                return get_seq_number() > act.get_seq_number();
        }
+  MEMALLOC
 private:
        action_type type;
        memory_order order;
@@ -57,6 +57,6 @@ private:
        int seq_number;
 };
 
-typedef std::list<class ModelAction *> action_list_t;
+typedef std::list<class ModelAction *, MyAlloc< class ModelAction * > > action_list_t;
 
 #endif /* __ACTION_H__ */