[libcxx-commits] [libcxx] c04bcad - [libc++][NFC] Use _LIBCPP_STD_VER instead of __cpp_lib_atomic_is_always_lock_free

[Nikolas Klauser via libcxx-commits]

Author: Nikolas Klauser
Date: 2023-05-13T16:27:03-07:00
New Revision: c04bcadf30ee07d437a238f78c2fb2c90be5c40c

URL: https://github.com/llvm/llvm-project/commit/c04bcadf30ee07d437a238f78c2fb2c90be5c40c
DIFF: https://github.com/llvm/llvm-project/commit/c04bcadf30ee07d437a238f78c2fb2c90be5c40c.diff

LOG: [libc++][NFC] Use _LIBCPP_STD_VER instead of __cpp_lib_atomic_is_always_lock_free

Reviewed By: #libc, ldionne, Mordante

Spies: Mordante, libcxx-commits

Differential Revision: https://reviews.llvm.org/D150421

Added: 
    

Modified: 
    libcxx/include/__atomic/aliases.h
    libcxx/include/__atomic/atomic_base.h

Removed: 
    


################################################################################
diff  --git a/libcxx/include/__atomic/aliases.h b/libcxx/include/__atomic/aliases.h
index 806589b630ee2..e2f9fae4094ef 100644
--- a/libcxx/include/__atomic/aliases.h
+++ b/libcxx/include/__atomic/aliases.h
@@ -82,7 +82,7 @@ using atomic_uintmax_t = atomic<uintmax_t>;
 
 // atomic_*_lock_free : prefer the contention type most highly, then the largest lock-free type
 
-#ifdef __cpp_lib_atomic_is_always_lock_free
+#if _LIBCPP_STD_VER >= 17
 #  define _LIBCPP_CONTENTION_LOCK_FREE ::std::__libcpp_is_always_lock_free<__cxx_contention_t>::__value
 #else
 #  define _LIBCPP_CONTENTION_LOCK_FREE false

diff  --git a/libcxx/include/__atomic/atomic_base.h b/libcxx/include/__atomic/atomic_base.h
index 7a9ba78433194..87100ba5d8a50 100644
--- a/libcxx/include/__atomic/atomic_base.h
+++ b/libcxx/include/__atomic/atomic_base.h
@@ -33,7 +33,7 @@ struct __atomic_base  // false
 {
     mutable __cxx_atomic_impl<_Tp> __a_;
 
-#if defined(__cpp_lib_atomic_is_always_lock_free)
+#if _LIBCPP_STD_VER >= 17
   static _LIBCPP_CONSTEXPR bool is_always_lock_free = __libcpp_is_always_lock_free<__cxx_atomic_impl<_Tp> >::__value;
 #endif
 
@@ -139,7 +139,7 @@ struct __atomic_base  // false
     __atomic_base(const __atomic_base&) = delete;
 };
 
-#if defined(__cpp_lib_atomic_is_always_lock_free)
+#if _LIBCPP_STD_VER >= 17
 template <class _Tp, bool __b>
 _LIBCPP_CONSTEXPR bool __atomic_base<_Tp, __b>::is_always_lock_free;
 #endif