From: Brian Demsky <bdemsky@uci.edu>
Date: Thu, 7 Mar 2013 03:33:14 +0000 (-0800)
Subject: do merge...push right code
X-Git-Tag: oopsla2013-final~27^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker-benchmarks.git;a=commitdiff_plain;h=391f44d47dad3cf21f18a858504b902ec48fe032;hp=037b00400699b8bd88b250d6d5b053a85edb2a61

do merge...push right code
Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker-benchmarks

Conflicts:
	chase-lev-deque/main.c
---

diff --git a/chase-lev-deque/main.c b/chase-lev-deque/main.c
index 0a29a51..424806f 100644
--- a/chase-lev-deque/main.c
+++ b/chase-lev-deque/main.c
@@ -3,6 +3,9 @@
 #include <stdio.h>
 #include <threads.h>
 #include <stdatomic.h>
+#include <stdio.h>
+
+#include "model-assert.h"
 
 #include "deque.h"
 
@@ -26,6 +29,7 @@ int user_main(int argc, char **argv)
 	b=take(q);
 	c=take(q);
 	thrd_join(t);
+
 	bool correct=true;
 	if (a!=1 && a!=2 && a!=4 && a!= EMPTY)
 		correct=false;
@@ -37,5 +41,6 @@ int user_main(int argc, char **argv)
 		correct=false;
 	if (!correct)
 		printf("a=%d b=%d c=%d\n",a,b,c);
+
 	return 0;
 }