merge and resolve conflict

[c11tester.git] / classlist.h

diff --git a/classlist.h b/classlist.h
index e6a5e4ec7e2e091673d569ea6db118d53649b4d3..3aca3e11ceb086a65aef19bf2dec9caf05b90db4 100644 (file)
--- a/classlist.h
+++ b/classlist.h
@@ -1,5 +1,6 @@
 #ifndef CLASSLIST_H
 #define CLASSLIST_H
+#include <inttypes.h>
 #include "stl-model.h"
 
 class ClockVector;
@@ -13,10 +14,13 @@ class Scheduler;
 class Thread;
 class TraceAnalysis;
 class Fuzzer;
+class FuncNode;
+class FuncInst;
 
 struct model_snapshot_members;
 struct bug_message;
 typedef SnapList<ModelAction *> action_list_t;
+typedef SnapList<uint32_t> func_id_list_t;
 
 extern volatile int forklock;
 #endif