X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker-benchmarks.git;a=blobdiff_plain;f=include%2Funrelacy.h;h=c16a373b7945bf1caf142956f5545848d28ce2d6;hp=3f2e5ebdf429b918b0624a81be88c4100ac47de7;hb=6254750fb7b01a21dad05459d3d9f9519ef2f1ee;hpb=fcf905f172a2b1f019e2b4e730b2628e487d2b56

diff --git a/include/unrelacy.h b/include/unrelacy.h
index 3f2e5eb..c16a373 100644
--- a/include/unrelacy.h
+++ b/include/unrelacy.h
@@ -2,12 +2,17 @@
 #define __UNRELACY_H__
 
 #include <stdatomic.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <mutex>
+#include <condition_variable>
+
+#include <model-assert.h>
 
 #define $
 
-/* Should re-define to something meaningful */
-#define ASSERT(expr)
-#define RL_ASSERT(expr)
+#define ASSERT(expr) MODEL_ASSERT(expr)
+#define RL_ASSERT(expr) MODEL_ASSERT(expr)
 
 #define RL_NEW new
 #define RL_DELETE(expr) delete expr
@@ -24,12 +29,13 @@ namespace rl {
 	struct var {
 		var() { value = 0; }
 		var(T v) { value = v; }
-		var(var const& r) { value = r; }
+		var(var const& r) { value = r.value; }
 		~var() { }
 
 		void operator = (T v) { value = v; }
 		T operator () () { return value; }
 		void operator += (T v) { value += v; }
+		bool operator == (const struct var<T> v) const { return value == v.value; }
 
 		T value;
 	};