summaryrefslogtreecommitdiff
path: root/Source/Core/Common/Thread.h
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-08-14 01:14:35 -0400
committerLioncash <mathew1800@gmail.com>2014-08-16 23:33:19 -0400
commitd18d3e1f3ef788d764ff2110ee3d1aaad51a6479 (patch)
tree118e4b68c19e0c5e6b1ce8e841b42fb23e389028 /Source/Core/Common/Thread.h
parent2270c3e90a29df757ca6d0d5a1809a9aab7bc1fe (diff)
Common: Get rid of StdConditionVariable, StdMutex, and StdThread.
All of the compilers we support have support for these now.
Diffstat (limited to 'Source/Core/Common/Thread.h')
-rw-r--r--Source/Core/Common/Thread.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/Common/Thread.h b/Source/Core/Common/Thread.h
index 54045caf26..6c5be6b446 100644
--- a/Source/Core/Common/Thread.h
+++ b/Source/Core/Common/Thread.h
@@ -4,14 +4,14 @@
#pragma once
+#include <condition_variable>
#include <cstdio>
#include <cstring>
+#include <mutex>
+#include <thread>
-// Don't include common.h here as it will break LogManager
+// Don't include Common.h here as it will break LogManager
#include "Common/CommonTypes.h"
-#include "Common/StdConditionVariable.h"
-#include "Common/StdMutex.h"
-#include "Common/StdThread.h"
// This may not be defined outside _WIN32
#ifndef _WIN32