[libcxx] r248240 - Fix <atomic> with -pedantic-errors

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Mon Sep 21 22:15:35 2015
New Revision: 248240

URL: http://llvm.org/viewvc/llvm-project?rev=248240&view=rev
Log:
Fix <atomic> with -pedantic-errors

Modified:
    libcxx/trunk/include/__config

Modified: libcxx/trunk/include/__config
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=248240&r1=248239&r2=248240&view=diff
==============================================================================
--- libcxx/trunk/include/__config (original)
+++ libcxx/trunk/include/__config Mon Sep 21 22:15:35 2015
@@ -786,7 +786,7 @@ extern "C" void __sanitizer_annotate_con
 #define _LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS
 #endif
 
-#if __has_extension(c_atomic)
+#if __has_feature(cxx_atomic) || __has_extension(c_atomic)
 #define _LIBCPP_HAS_C_ATOMIC_IMP
 #elif _GNUC_VER > 407
 #define _LIBCPP_HAS_GCC_ATOMIC_IMP