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 0a29a51572551004ca40b3a8c28551e9e161c62d..424806f3edab28eaa272071f9321bb0217e47c6a 100644 (file)
--- 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;
 }