From: Brian Norris <banorris@uci.edu>
Date: Fri, 12 Oct 2012 17:14:44 +0000 (-0700)
Subject: condition_variable: move header
X-Git-Tag: pldi2013~49
X-Git-Url: http://demsky.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=d1b0d38c3fb2f0466f9af35b0b859e51978c4859

condition_variable: move header

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

  #include <condition_variable>
---

diff --git a/conditionvariable.cc b/conditionvariable.cc
index 5bd0beb..ce33e80 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/conditionvariable.h
deleted file mode 100644
index d1db7ff..0000000
--- a/conditionvariable.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef CONDITIONVARIABLE_H
-#define CONDITIONVARIABLE_H
-
-namespace std {
-	class mutex;
-
-	struct condition_variable_state {
-		int reserved;
-	};
-
-	class condition_variable {
-	public:
-		condition_variable();
-		~condition_variable();
-		void notify_one();
-		void notify_all();
-		void wait(mutex& lock);
-		
-	private:
-		struct condition_variable_state state;
-	};
-}
-#endif
diff --git a/include/condition_variable b/include/condition_variable
new file mode 100644
index 0000000..2a7447b
--- /dev/null
+++ b/include/condition_variable
@@ -0,0 +1,24 @@
+#ifndef __CXX_CONDITION_VARIABLE__
+#define __CXX_CONDITION_VARIABLE__
+
+namespace std {
+	class mutex;
+
+	struct condition_variable_state {
+		int reserved;
+	};
+
+	class condition_variable {
+	public:
+		condition_variable();
+		~condition_variable();
+		void notify_one();
+		void notify_all();
+		void wait(mutex& lock);
+		
+	private:
+		struct condition_variable_state state;
+	};
+}
+
+#endif /* __CXX_CONDITION_VARIABLE__ */
diff --git a/test/condvar.cc b/test/condvar.cc
index 488f9be..ff8feb1 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;