get rid of some compile errors and warnings

diff --git a/execution.cc b/execution.cc
index d75499f1349a4e24c69a1c01c90aa8bb599240d5..2c08711eee0d1a655272bd56f1adf0d900ef599d 100644 (file)
--- a/execution.cc
+++ b/execution.cc
@@ -778,9 +778,6 @@ bool ModelExecution::r_modification_order(ModelAction *curr, const ModelAction *
 
        /* Last SC fence in the current thread */
        ModelAction *last_sc_fence_local = get_last_seq_cst_fence(curr->get_tid(), NULL);
-       ModelAction *last_sc_write = NULL;
-       if (curr->is_seqcst())
-               last_sc_write = get_last_seq_cst_write(curr);
 
        int tid = curr->get_tid();
        ModelAction *prev_same_thread = NULL;

diff --git a/test/condvar.cc b/test/condvar.cc
index fcfd59a8825f5b0946fb4fd3786d9347b26a364e..0457c41479d33eab3bee952fa6883f1d6f007628 100644 (file)
--- a/test/condvar.cc
+++ b/test/condvar.cc
@@ -3,11 +3,11 @@
 #include "threads.h"
 #include "librace.h"
 #include "stdatomic.h"
-#include <mutex>
+#include <mutex.h>
 #include <condition_variable>
 
-std::mutex * m;
-std::condition_variable *v;
+cdsc::mutex * m;
+cdsc::condition_variable *v;
 int shareddata;
 
 static void a(void *obj)
@@ -32,8 +32,8 @@ int user_main(int argc, char **argv)
 {
        thrd_t t1, t2;
        store_32(&shareddata, (unsigned int) 0);
-       m=new std::mutex();
-       v=new std::condition_variable();
+       m=new cdsc::mutex();
+       v=new cdsc::condition_variable();
 
        thrd_create(&t1, (thrd_start_t)&a, NULL);
        thrd_create(&t2, (thrd_start_t)&b, NULL);