X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=mutex.cc;h=7fa0b589c8a4535a276c7f8f95eda76782bff554;hb=0a0177d3795ceb0eea9e0e803148df36038776a4;hp=51315d94bbf3081959c4c59d1d4c6af727f4a7ea;hpb=85fac9c01a7269fe0a879f97155f9c5976672606;p=c11tester.git

diff --git a/mutex.cc b/mutex.cc
index 51315d94..7fa0b589 100644
--- a/mutex.cc
+++ b/mutex.cc
@@ -1,5 +1,8 @@
-#include "mutex.h"
+#include <mutex>
+
 #include "model.h"
+#include "threads-model.h"
+#include "clockvector.h"
 
 namespace std {
 mutex::mutex() {
@@ -14,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() {