From: Brian Norris <banorris@uci.edu>
Date: Wed, 23 Jan 2013 19:02:38 +0000 (-0800)
Subject: nodestack/promise: move future_value struct, update headers
X-Git-Tag: oopsla2013~343
X-Git-Url: http://demsky.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=e9bc426a2bc92870a9f1ab2f5e7387e2867522ef

nodestack/promise: move future_value struct, update headers

struct future_value will be used more closely with class Promise, so put
it in the promise.h header. This requires some updates to other header
inclusions.
---

diff --git a/nodestack.cc b/nodestack.cc
index 46f7d12..e080015 100644
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -8,6 +8,7 @@
 #include "common.h"
 #include "model.h"
 #include "threads-model.h"
+#include "modeltypes.h"
 
 /**
  * @brief Node constructor
diff --git a/nodestack.h b/nodestack.h
index d2e6491..13c6d09 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -10,8 +10,8 @@
 #include <inttypes.h>
 
 #include "mymemory.h"
-#include "modeltypes.h"
 #include "schedule.h"
+#include "promise.h"
 
 class ModelAction;
 class Thread;
@@ -32,11 +32,6 @@ class Thread;
 
 typedef int promise_t;
 
-struct future_value {
-	uint64_t value;
-	modelclock_t expiration;
-};
-
 struct fairness_info {
 	unsigned int enabled_count;
 	unsigned int turns;
diff --git a/promise.h b/promise.h
index 3166c8f..413d360 100644
--- a/promise.h
+++ b/promise.h
@@ -11,6 +11,12 @@
 #include "threads-model.h"
 
 #include "model.h"
+#include "modeltypes.h"
+
+struct future_value {
+	uint64_t value;
+	modelclock_t expiration;
+};
 
 class Promise {
  public:
diff --git a/schedule.h b/schedule.h
index 83b25c6..1031232 100644
--- a/schedule.h
+++ b/schedule.h
@@ -6,6 +6,7 @@
 #define __SCHEDULE_H__
 
 #include "mymemory.h"
+#include "modeltypes.h"
 
 /* Forward declaration */
 class Thread;