diff options
| author | bunnei <bunneidev@gmail.com> | 2014-09-07 22:08:06 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-09-07 22:08:06 -0400 |
| commit | 85f1b76cd8a223968d61fbd93235acee5dcab47e (patch) | |
| tree | 8b062c49cd6b6d34e39e4ad79005815e5c694c73 /src/common/thread.h | |
| parent | a1300865873541e532545088d2e65ec83ac69335 (diff) | |
| parent | 498d1a37f16d36b0c6341b074e5390a9194567a7 (diff) | |
Merge pull request #87 from archshift/remove-cruft
Removed redundant headers for std implementations
Diffstat (limited to 'src/common/thread.h')
| -rw-r--r-- | src/common/thread.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/common/thread.h b/src/common/thread.h index dbb9da53b..f7ace21b4 100644 --- a/src/common/thread.h +++ b/src/common/thread.h @@ -4,14 +4,13 @@ #pragma once -#include "common/std_condition_variable.h" -#include "common/std_mutex.h" -#include "common/std_thread.h" - // Don't include common.h here as it will break LogManager #include "common/common_types.h" #include <cstdio> #include <cstring> +#include <thread> +#include <condition_variable> +#include <mutex> // This may not be defined outside _WIN32 #ifndef _WIN32 |