diff options
| author |  bunnei | 2014-09-07 22:08:06 -0400 |
|---|---|---|
| committer | bunnei | 2014-09-07 22:08:06 -0400 |
| commit | 85f1b76cd8a223968d61fbd93235acee5dcab47e (patch) | |
| tree | 8b062c49cd6b6d34e39e4ad79005815e5c694c73 /src/common/thread.h | |
| parent | Merge pull request #93 from lioncash/ref (diff) | |
| parent | Removed common/std_xyz, instead using the std header (diff) | |
| download | yuzu-85f1b76cd8a223968d61fbd93235acee5dcab47e.tar.gz yuzu-85f1b76cd8a223968d61fbd93235acee5dcab47e.tar.xz yuzu-85f1b76cd8a223968d61fbd93235acee5dcab47e.zip | |
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 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include "common/std_condition_variable.h" | ||
| 8 | #include "common/std_mutex.h" | ||
| 9 | #include "common/std_thread.h" | ||
| 10 | |||
| 11 | // Don't include common.h here as it will break LogManager | 7 | // Don't include common.h here as it will break LogManager |
| 12 | #include "common/common_types.h" | 8 | #include "common/common_types.h" |
| 13 | #include <cstdio> | 9 | #include <cstdio> |
| 14 | #include <cstring> | 10 | #include <cstring> |
| 11 | #include <thread> | ||
| 12 | #include <condition_variable> | ||
| 13 | #include <mutex> | ||
| 15 | 14 | ||
| 16 | // This may not be defined outside _WIN32 | 15 | // This may not be defined outside _WIN32 |
| 17 | #ifndef _WIN32 | 16 | #ifndef _WIN32 |