diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-08-29 22:29:33 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-08-29 22:29:33 -0500 |
| commit | 8bb16d8e989be8c753b95f35a9ac94bdfd7f5ff0 (patch) | |
| tree | 55f9f6bb14072fa595cb067b8f78d8a5f700da75 /Source | |
| parent | 0df64775ea50e58aabdd4ee4dec1f0b944036a3d (diff) | |
[Android] Android NDK now supports full implementations of std::mutex, std::thread, and std::conditional_variable so there is no need to have our own implementations there now.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Common/Src/StdConditionVariable.h | 2 | ||||
| -rw-r--r-- | Source/Core/Common/Src/StdMutex.h | 2 | ||||
| -rw-r--r-- | Source/Core/Common/Src/StdThread.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/Common/Src/StdConditionVariable.h b/Source/Core/Common/Src/StdConditionVariable.h index 63f4551950..048a7e8975 100644 --- a/Source/Core/Common/Src/StdConditionVariable.h +++ b/Source/Core/Common/Src/StdConditionVariable.h @@ -9,7 +9,7 @@ #define __has_include(s) 0 #endif -#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID +#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ // GCC 4.4 provides <condition_variable> #include <condition_variable> diff --git a/Source/Core/Common/Src/StdMutex.h b/Source/Core/Common/Src/StdMutex.h index f66a5d1b2e..ce46a2f591 100644 --- a/Source/Core/Common/Src/StdMutex.h +++ b/Source/Core/Common/Src/StdMutex.h @@ -9,7 +9,7 @@ #define __has_include(s) 0 #endif -#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID +#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ // GCC 4.4 provides <mutex> #include <mutex> #elif __has_include(<mutex>) && !ANDROID diff --git a/Source/Core/Common/Src/StdThread.h b/Source/Core/Common/Src/StdThread.h index 134bbb2fc0..e43d283443 100644 --- a/Source/Core/Common/Src/StdThread.h +++ b/Source/Core/Common/Src/StdThread.h @@ -9,7 +9,7 @@ #define __has_include(s) 0 #endif -#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID +#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ // GCC 4.4 provides <thread> #ifndef _GLIBCXX_USE_SCHED_YIELD #define _GLIBCXX_USE_SCHED_YIELD |