From d1b0d38c3fb2f0466f9af35b0b859e51978c4859 Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Fri, 12 Oct 2012 10:14:44 -0700
Subject: [PATCH] condition_variable: move header

Move from "conditionvariable.h" to "include/condition_variable". This
allows the normal C++11 #include syntax of:

  #include <condition_variable>
---
 conditionvariable.cc                              | 2 +-
 conditionvariable.h => include/condition_variable | 7 ++++---
 test/condvar.cc                                   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename conditionvariable.h => include/condition_variable (73%)

diff --git a/conditionvariable.cc b/conditionvariable.cc
index 5bd0beb3..ce33e808 100644
--- a/conditionvariable.cc
+++ b/conditionvariable.cc
@@ -1,6 +1,6 @@
 #include <mutex>
 #include "model.h"
-#include "conditionvariable.h"
+#include <condition_variable>
 
 
 namespace std {
diff --git a/conditionvariable.h b/include/condition_variable
similarity index 73%
rename from conditionvariable.h
rename to include/condition_variable
index d1db7ffb..2a7447b7 100644
--- a/conditionvariable.h
+++ b/include/condition_variable
@@ -1,5 +1,5 @@
-#ifndef CONDITIONVARIABLE_H
-#define CONDITIONVARIABLE_H
+#ifndef __CXX_CONDITION_VARIABLE__
+#define __CXX_CONDITION_VARIABLE__
 
 namespace std {
 	class mutex;
@@ -20,4 +20,5 @@ namespace std {
 		struct condition_variable_state state;
 	};
 }
-#endif
+
+#endif /* __CXX_CONDITION_VARIABLE__ */
diff --git a/test/condvar.cc b/test/condvar.cc
index 488f9be0..ff8feb1e 100644
--- a/test/condvar.cc
+++ b/test/condvar.cc
@@ -4,7 +4,7 @@
 #include "librace.h"
 #include "stdatomic.h"
 #include <mutex>
-#include "conditionvariable.h"
+#include <condition_variable>
 
 std::mutex * m;
 std::condition_variable *v;
-- 
2.34.1