From 7181e517ee521dd6afa240daf23c6e96d95bca2c Mon Sep 17 00:00:00 2001
From: Brian Demsky <bdemsky@uci.edu>
Date: Mon, 22 Jul 2019 16:35:21 -0700
Subject: [PATCH] fix merge issue

---
 datarace.h | 1 -
 model.cc   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/datarace.h b/datarace.h
index c78f5a42..2de2a339 100644
--- a/datarace.h
+++ b/datarace.h
@@ -46,7 +46,6 @@ void initRaceDetector();
 void raceCheckWrite(thread_id_t thread, void *location);
 void raceCheckRead(thread_id_t thread, const void *location);
 void recordWrite(thread_id_t thread, void *location);
-bool checkDataRaces();
 void assert_race(struct DataRace *race);
 bool hasNonAtomicStore(const void *location);
 void setAtomicStoreFlag(const void *location);
diff --git a/model.cc b/model.cc
index 17cba12a..cfbc3b86 100644
--- a/model.cc
+++ b/model.cc
@@ -266,7 +266,6 @@ bool ModelChecker::next_execution()
 		if (execution->is_deadlocked())
 			assert_bug("Deadlock detected");
 
-		checkDataRaces();
 		run_trace_analyses();
 	}
 
-- 
2.34.1