From 9a416eb64865be1728786eb65b1c4b995cfa194d Mon Sep 17 00:00:00 2001 From: Brian Demsky Date: Wed, 12 Sep 2012 22:08:22 -0700 Subject: [PATCH] missing changes --- Makefile | 2 +- model.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 67b6e6d..2acdbc7 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 90180a9..fec8d1f 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;} -- 2.34.1