diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-10-30 18:45:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-30 18:45:23 +0000 |
| commit | 37f11668f83460a2a744c3d7f3381ea589bc643e (patch) | |
| tree | eed8f795578786c113abffab5e9c93375fb26c6f | |
| parent | 0571dfbb0315dd1bdf3939dcb197bb6094744c4f (diff) | |
| parent | 37803394ec494aad7b39bd1a447e975da596eadc (diff) | |
| download | prebuilts_ndk-37f11668f83460a2a744c3d7f3381ea589bc643e.zip prebuilts_ndk-37f11668f83460a2a744c3d7f3381ea589bc643e.tar.gz prebuilts_ndk-37f11668f83460a2a744c3d7f3381ea589bc643e.tar.bz2 | |
am 37803394: am bb3b5843: Merge "Cherry-pick: Only use <atomic> for C++11 and newer"
* commit '37803394ec494aad7b39bd1a447e975da596eadc':
Cherry-pick: Only use <atomic> for C++11 and newer
6 files changed, 6 insertions, 6 deletions
diff --git a/9/platforms/android-21/arch-arm/usr/include/stdatomic.h b/9/platforms/android-21/arch-arm/usr/include/stdatomic.h index bcea859..58cb1bc 100644 --- a/9/platforms/android-21/arch-arm/usr/include/stdatomic.h +++ b/9/platforms/android-21/arch-arm/usr/include/stdatomic.h @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -#if defined(__cplusplus) && defined(_USING_LIBCXX) +#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX) # ifdef __clang__ # if __has_feature(cxx_atomic) # define _STDATOMIC_HAVE_ATOMIC diff --git a/9/platforms/android-21/arch-arm64/usr/include/stdatomic.h b/9/platforms/android-21/arch-arm64/usr/include/stdatomic.h index bcea859..58cb1bc 100644 --- a/9/platforms/android-21/arch-arm64/usr/include/stdatomic.h +++ b/9/platforms/android-21/arch-arm64/usr/include/stdatomic.h @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -#if defined(__cplusplus) && defined(_USING_LIBCXX) +#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX) # ifdef __clang__ # if __has_feature(cxx_atomic) # define _STDATOMIC_HAVE_ATOMIC diff --git a/9/platforms/android-21/arch-mips/usr/include/stdatomic.h b/9/platforms/android-21/arch-mips/usr/include/stdatomic.h index bcea859..58cb1bc 100644 --- a/9/platforms/android-21/arch-mips/usr/include/stdatomic.h +++ b/9/platforms/android-21/arch-mips/usr/include/stdatomic.h @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -#if defined(__cplusplus) && defined(_USING_LIBCXX) +#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX) # ifdef __clang__ # if __has_feature(cxx_atomic) # define _STDATOMIC_HAVE_ATOMIC diff --git a/9/platforms/android-21/arch-mips64/usr/include/stdatomic.h b/9/platforms/android-21/arch-mips64/usr/include/stdatomic.h index bcea859..58cb1bc 100644 --- a/9/platforms/android-21/arch-mips64/usr/include/stdatomic.h +++ b/9/platforms/android-21/arch-mips64/usr/include/stdatomic.h @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -#if defined(__cplusplus) && defined(_USING_LIBCXX) +#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX) # ifdef __clang__ # if __has_feature(cxx_atomic) # define _STDATOMIC_HAVE_ATOMIC diff --git a/9/platforms/android-21/arch-x86/usr/include/stdatomic.h b/9/platforms/android-21/arch-x86/usr/include/stdatomic.h index bcea859..58cb1bc 100644 --- a/9/platforms/android-21/arch-x86/usr/include/stdatomic.h +++ b/9/platforms/android-21/arch-x86/usr/include/stdatomic.h @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -#if defined(__cplusplus) && defined(_USING_LIBCXX) +#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX) # ifdef __clang__ # if __has_feature(cxx_atomic) # define _STDATOMIC_HAVE_ATOMIC diff --git a/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h b/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h index bcea859..58cb1bc 100644 --- a/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h +++ b/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -#if defined(__cplusplus) && defined(_USING_LIBCXX) +#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX) # ifdef __clang__ # if __has_feature(cxx_atomic) # define _STDATOMIC_HAVE_ATOMIC |