From d5188b9694c29e0d776a643965f2461a1fbbe5e1 Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Thu, 11 Oct 2012 16:48:39 -0700
Subject: [PATCH] mutex: move mutex.h to standard name/location

The important exported interfaces should be in the include/ dir. Also,
C++11 programs should use this header as:

    #include <mutex>
---
 mutex.h => include/mutex | 11 ++++++++---
 model.cc                 |  2 +-
 mutex.cc                 |  3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)
 rename mutex.h => include/mutex (71%)

diff --git a/mutex.h b/include/mutex
similarity index 71%
rename from mutex.h
rename to include/mutex
index 53fccb2..31fd7eb 100644
--- a/mutex.h
+++ b/include/mutex
@@ -1,5 +1,10 @@
-#ifndef MUTEX_H
-#define MUTEX_H
+/**
+ * @file mutex
+ * @brief C++11 mutex interface header
+ */
+
+#ifndef __CXX_MUTEX__
+#define __CXX_MUTEX__
 
 #include "modeltypes.h"
 
@@ -23,4 +28,4 @@ namespace std {
 		struct mutex_state state;
 	};
 }
-#endif
+#endif /* __CXX_MUTEX__ */
diff --git a/model.cc b/model.cc
index a96a79c..b3b517c 100644
--- a/model.cc
+++ b/model.cc
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <algorithm>
+#include <mutex>
 
 #include "model.h"
 #include "action.h"
@@ -11,7 +12,6 @@
 #include "cyclegraph.h"
 #include "promise.h"
 #include "datarace.h"
-#include "mutex.h"
 #include "threads-model.h"
 
 #define INITIAL_THREAD_ID	0
diff --git a/mutex.cc b/mutex.cc
index ce74735..91b0b9a 100644
--- a/mutex.cc
+++ b/mutex.cc
@@ -1,4 +1,5 @@
-#include "mutex.h"
+#include <mutex>
+
 #include "model.h"
 #include "threads-model.h"
 #include "clockvector.h"
-- 
2.34.1