X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mutex.cc;h=145000548be4665f7f8a2cfb4fb657c2ab9a5382;hp=6ef297a594d6b897110e7663c1f3753f859e0c3a;hb=5fa2efec1354b2781ff0b29460ec8e9b8fa75991;hpb=12b1a10eeff58161619bafcfd8e288b3e2c76621

diff --git a/mutex.cc b/mutex.cc
index 6ef297a5..14500054 100644
--- a/mutex.cc
+++ b/mutex.cc
@@ -1,7 +1,9 @@
-#include "mutex.h"
+#include <mutex>
+
 #include "model.h"
-#include "threads.h"
+#include "threads-model.h"
 #include "clockvector.h"
+#include "action.h"
 
 namespace std {
 mutex::mutex() {
@@ -16,8 +18,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() {