X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=mutex.cc;h=7fa0b589c8a4535a276c7f8f95eda76782bff554;hb=82df62c2b0805848b87bb71df5b66a4a66f8e25d;hp=6ef297a594d6b897110e7663c1f3753f859e0c3a;hpb=12b1a10eeff58161619bafcfd8e288b3e2c76621;p=model-checker.git

diff --git a/mutex.cc b/mutex.cc
index 6ef297a..7fa0b58 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() {