missing changes

diff --git a/Makefile b/Makefile
index 67b6e6dfa5212438321639f5e4ef11bc8e2768e5..2acdbc7dff8a7738c6f99349421aa66bc97b5d5b 100644 (file)
--- 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 90180a993ecb065eeb062432b83342cc9fd785c4..fec8d1f1ea55bf331017f9817515cae7e0d93c34 100644 (file)
--- 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;}