From add39dfea34c97a19bb0a9691822026e7b2c6a60 Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Thu, 30 Oct 2014 10:37:58 -0700
Subject: [PATCH] Cherry-pick: Only use <atomic> for C++11 and newer

See bionic 3ce0769aa5f9a991af1d167f730d987dd002253c
BUG=17736764

Change-Id: If63b6c8394f8574fd198fd24dfc42a3aaba865d5
---
 ndk/platforms/android-21/include/stdatomic.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ndk/platforms/android-21/include/stdatomic.h b/ndk/platforms/android-21/include/stdatomic.h
index bcea85924..58cb1bc0e 100644
--- a/ndk/platforms/android-21/include/stdatomic.h
+++ b/ndk/platforms/android-21/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