diff options
| author |  bunnei | 2014-08-17 20:32:04 -0400 |
|---|---|---|
| committer | bunnei | 2014-08-17 20:32:04 -0400 |
| commit | b26f25356d4463b5e4ccd36cf7365342d7306e7f (patch) | |
| tree | 1cbe356089890c22e3f1e4084891f306d6e62d97 /src/common/std_thread.h | |
| parent | Merge pull request #53 from lioncash/memmap (diff) | |
| parent | Common: Move remaining C header includes over to their C++ equivalent (diff) | |
| download | yuzu-b26f25356d4463b5e4ccd36cf7365342d7306e7f.tar.gz yuzu-b26f25356d4463b5e4ccd36cf7365342d7306e7f.tar.xz yuzu-b26f25356d4463b5e4ccd36cf7365342d7306e7f.zip | |
Merge pull request #51 from lioncash/pragma
Common: Move header guards over to pragma once.
Diffstat (limited to 'src/common/std_thread.h')
| -rw-r--r-- | src/common/std_thread.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/common/std_thread.h b/src/common/std_thread.h index 9ed0072c3..ce1336ee7 100644 --- a/src/common/std_thread.h +++ b/src/common/std_thread.h | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | 1 | #pragma once | |
| 2 | #ifndef STD_THREAD_H_ | ||
| 3 | #define STD_THREAD_H_ | ||
| 4 | 2 | ||
| 5 | #define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) | 3 | #define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) |
| 6 | #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) | 4 | #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) |
| @@ -314,4 +312,3 @@ inline thread::id get_id() | |||
| 314 | #undef THREAD_HANDLE | 312 | #undef THREAD_HANDLE |
| 315 | 313 | ||
| 316 | #endif | 314 | #endif |
| 317 | #endif | ||