More clean-ups

[invirt/third/libt4.git] / types.h

diff --git a/types.h b/types.h
index 3ad73fb..6e6f0f6 100644 (file)
--- a/types.h
+++ b/types.h
@@ -12,6 +12,10 @@ using std::min_element;
 using std::find;
 using std::count_if;
 
+#include <condition_variable>
+using cond = std::condition_variable;
+using std::cv_status;
+
 #include <chrono>
 using std::chrono::seconds;
 using std::chrono::milliseconds;
@@ -71,8 +75,6 @@ using std::weak_ptr;
 #include <mutex>
 using std::mutex;
 using lock = std::unique_lock<std::mutex>;
-using cond = std::condition_variable;
-using std::cv_status;
 
 #include <sstream>
 using std::ostringstream;
@@ -161,7 +163,7 @@ inline vector<string> explode(const string &s, string delim=" ") {
     return out;
 }
 
-#include "lang/verify.h"
+#include "verify.h"
 #include "threaded_log.h"
 
 // struct tuple adapter, useful for marshalling