From: Brian Demsky <bdemsky@uci.edu>
Date: Thu, 13 Sep 2012 05:08:22 +0000 (-0700)
Subject: missing changes
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9a416eb64865be1728786eb65b1c4b995cfa194d;p=c11tester.git

missing changes
---

diff --git a/Makefile b/Makefile
index 67b6e6df..2acdbc7d 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ include $(DEPS)
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
 
-mac: CPPFLAGS += -D_XOPEN_SOURCE -DMAC -DCONFIG_DEBUG
+mac: CPPFLAGS += -D_XOPEN_SOURCE -DMAC
 mac: LDFLAGS=-ldl
 mac: SHARED=-Wl,-undefined,dynamic_lookup -dynamiclib
 mac: all
diff --git a/model.h b/model.h
index 90180a99..fec8d1f1 100644
--- a/model.h
+++ b/model.h
@@ -89,9 +89,6 @@ private:
 	/** The scheduler to use: tracks the running/ready Threads */
 	Scheduler *scheduler;
 	
-	bool ensure_rmw_acyclic(const ModelAction * read, const ModelAction *write);
-
-
 	bool thin_air_constraint_may_allow(const ModelAction * writer, const ModelAction *reader);
 	bool has_asserted() {return asserted;}
 	void reset_asserted() {asserted=false;}