X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mutex.cc;h=7fa0b589c8a4535a276c7f8f95eda76782bff554;hp=6ef297a594d6b897110e7663c1f3753f859e0c3a;hb=b35625b0499717b3caab5344d7278a31fbee9cb6;hpb=81ea453e58cbb85fddff3aa8919dfbc59c3140eb

diff --git a/mutex.cc b/mutex.cc
index 6ef297a5..7fa0b589 100644
--- a/mutex.cc
+++ b/mutex.cc
@@ -1,6 +1,7 @@
-#include "mutex.h"
+#include <mutex>
+
 #include "model.h"
-#include "threads.h"
+#include "threads-model.h"
 #include "clockvector.h"
 
 namespace std {
@@ -16,8 +17,7 @@ void mutex::lock() {
 }
 	
 bool mutex::try_lock() {
-  model->switch_to_master(new ModelAction(ATOMIC_TRYLOCK, std::memory_order_seq_cst, this));
-  return thread_current()->get_return_value();
+  return model->switch_to_master(new ModelAction(ATOMIC_TRYLOCK, std::memory_order_seq_cst, this));
 }
 
 void mutex::unlock() {