am 90aa7e37: Merge "Only use <atomic> for C++11 and newer."

* commit '90aa7e374f9000577cde64c4fb88c5dab8dac62e':
  Only use <atomic> for C++11 and newer.
This commit is contained in:
Dan Albert 2014-10-16 16:27:37 +00:00 committed by Android Git Automerger
commit 96def860ae

View File

@ -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