don't include action.h from model.h

diff --git a/cmodelint.cc b/cmodelint.cc
index 76b4c90fa51b139cb8e70f891d8cc13692a34515..47aef05f28a1c61e72101e171e59da02354c5f09 100644 (file)
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -1,4 +1,5 @@
 #include "model.h"
+#include "action.h"
 #include "cmodelint.h"
 #include "threads-model.h"
 

diff --git a/conditionvariable.cc b/conditionvariable.cc
index ce33e8084f3908b181f5378f0e9565c5d6c2ad45..f79cf2a9feacef6c5f1ee3942e5750c58b34eb23 100644 (file)
--- a/conditionvariable.cc
+++ b/conditionvariable.cc
@@ -1,7 +1,7 @@
 #include <mutex>
 #include "model.h"
 #include <condition_variable>
-
+#include "action.h"
 
 namespace std {
 

diff --git a/datarace.cc b/datarace.cc
index c70d41897f4fd5c4ff9c68f3daf96d4ed6240ba6..1ec43be4e8cb72dc246782635fd6497ac8e6ffb3 100644 (file)
--- a/datarace.cc
+++ b/datarace.cc
@@ -6,6 +6,7 @@
 #include "mymemory.h"
 #include "clockvector.h"
 #include "config.h"
+#include "action.h"
 
 struct ShadowTable *root;
 std::vector<struct DataRace *> unrealizedraces;

diff --git a/impatomic.cc b/impatomic.cc
index c10c43e596682a960896f1cef7380e1dea5de9f7..2d48989c147d051bd61d3a4d01fe0e2ba1bcf9ea 100644 (file)
--- a/impatomic.cc
+++ b/impatomic.cc
@@ -2,6 +2,7 @@
 #include "common.h"
 #include "model.h"
 #include "threads-model.h"
+#include "action.h"
 
 namespace std {
 

diff --git a/libthreads.cc b/libthreads.cc
index 0a5699695f9e856f413bddec9714751a0313c99d..8e213aa858be5f56510871412e2cee3c906b78d6 100644 (file)
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -1,6 +1,7 @@
 #include <threads.h>
 #include "common.h"
 #include "threads-model.h"
+#include "action.h"
 
 /* global "model" object */
 #include "model.h"

diff --git a/model.h b/model.h
index 08bde0f8256d9005cc210a18f8ea4aefcf37c263..8ef825f3485a9e10079c528a96644cc2385d487d 100644 (file)
--- a/model.h
+++ b/model.h
@@ -8,20 +8,22 @@
 #include <vector>
 #include <cstddef>
 #include <ucontext.h>
+#include <inttypes.h>
 
 #include "mymemory.h"
-#include "action.h"
 #include "hashtable.h"
 #include "workqueue.h"
 #include "config.h"
 #include "modeltypes.h"
 
 /* Forward declaration */
+class Node;
 class NodeStack;
 class CycleGraph;
 class Promise;
 class Scheduler;
 class Thread;
+class ClockVector;
 struct model_snapshot_members;
 
 /** @brief Shorthand for a list of release sequence heads */

diff --git a/mutex.cc b/mutex.cc
index 7fa0b589c8a4535a276c7f8f95eda76782bff554..145000548be4665f7f8a2cfb4fb657c2ab9a5382 100644 (file)
--- a/mutex.cc
+++ b/mutex.cc
@@ -3,6 +3,7 @@
 #include "model.h"
 #include "threads-model.h"
 #include "clockvector.h"
+#include "action.h"
 
 namespace std {
 mutex::mutex() {

diff --git a/promise.cc b/promise.cc
index 8519feef5e678726b1ea2369e48a35e0d95631bd..0f5ba4d1573d3ffc652ad28edb3bc69e62742248 100644 (file)
--- a/promise.cc
+++ b/promise.cc
@@ -4,6 +4,8 @@
 #include "promise.h"
 #include "model.h"
 #include "schedule.h"
+#include "action.h"
+#include "threads-model.h"
 
 /**
  * @brief Promise constructor

diff --git a/promise.h b/promise.h
index 20aee036f99c3a6adad194b353846a524404ef1e..278b7cc224e34a262ebbca9c20d3294ede514d31 100644 (file)
--- a/promise.h
+++ b/promise.h
@@ -8,10 +8,12 @@
 #define __PROMISE_H__
 
 #include <inttypes.h>
-#include "threads-model.h"
+#include <vector>
 
-#include "model.h"
 #include "modeltypes.h"
+#include "mymemory.h"
+
+class ModelAction;
 
 struct future_value {
        uint64_t value;

diff --git a/threads.cc b/threads.cc
index a8f282a8b32efdb96d1d248570fc8b7574af92f7..1de548ccdb93ccd41a2a0248a49be2937dd87f01 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -7,6 +7,7 @@
 #include <threads.h>
 #include "common.h"
 #include "threads-model.h"
+#include "action.h"
 
 /* global "model" object */
 #include "model.h"