X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=classlist.h;h=e74ebcf64bdbb5aace60103095d47dcf09bfd395;hp=e528a47dc40ca1a3e84eaf30202e8af87debf2be;hb=251ac4b4bf3a9f2d3cfacc1e6618200ca1c431ac;hpb=a06bb220f1f67ac3e8e0b5ba656b2df7677ebeda

diff --git a/classlist.h b/classlist.h
index e528a47d..e74ebcf6 100644
--- a/classlist.h
+++ b/classlist.h
@@ -3,6 +3,7 @@
 #include <inttypes.h>
 #include "stl-model.h"
 #include "hashset.h"
+#include "modeltypes.h"
 
 class ClockVector;
 class CycleGraph;
@@ -19,10 +20,17 @@ class NewFuzzer;
 class FuncNode;
 class FuncInst;
 class Predicate;
+class ConcretePredicate;
+class WaitObj;
+class actionlist;
+
+#include "actionlist.h"
 
 struct model_snapshot_members;
 struct bug_message;
-typedef SnapList<ModelAction *> action_list_t;
+
+typedef SnapList<ModelAction *> simple_action_list_t;
+typedef actionlist action_list_t;
 typedef SnapList<uint32_t> func_id_list_t;
 typedef SnapList<FuncInst *> func_inst_list_t;
 
@@ -33,6 +41,8 @@ typedef HashSet<uint64_t, uint64_t, 0, snapshot_malloc, snapshot_calloc, snapsho
 typedef HSIterator<uint64_t, uint64_t, 0, snapshot_malloc, snapshot_calloc, snapshot_free> value_set_iter;
 typedef HashSet<void *, uintptr_t, 0, snapshot_malloc, snapshot_calloc, snapshot_free> loc_set_t;
 typedef HSIterator<void *, uintptr_t, 0, snapshot_malloc, snapshot_calloc, snapshot_free> loc_set_iter;
+typedef HashSet<thread_id_t, int, 0> thrd_id_set_t;
+typedef HSIterator<thread_id_t, int, 0> thrd_id_set_iter;
 
 extern volatile int modellock;
 #endif