From 743ca87fe8fdad0d8246c7f91a3b374be74e398c Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Tue, 7 Aug 2012 23:03:55 +0000 Subject: [PATCH] re PR libstdc++/54005 (Use __atomic_always_lock_free in libstdc++ is_lock_free instead of __atomic_is_lock_free) 2012-08-07 Benjamin Kosnik PR libstdc++/54005 * include/std/atomic: Use __atomic_always_lock_free. * include/bits/atomic_base.h: Same. From-SVN: r190216 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/atomic_base.h | 8 ++++---- libstdc++-v3/include/std/atomic | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3bd4ea39ef7..53fb00fc36d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2012-08-07 Benjamin Kosnik + + PR libstdc++/54005 + * include/std/atomic: Use __atomic_always_lock_free. + * include/bits/atomic_base.h: Same. + 2012-08-06 Paolo Carlini * testsuite/decimal/mixed-mode-cmp_neg.cc: Add test variable; minor diff --git a/libstdc++-v3/include/bits/atomic_base.h b/libstdc++-v3/include/bits/atomic_base.h index 9d5f4eb6ff0..598e1f1e945 100644 --- a/libstdc++-v3/include/bits/atomic_base.h +++ b/libstdc++-v3/include/bits/atomic_base.h @@ -422,11 +422,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION bool is_lock_free() const noexcept - { return __atomic_is_lock_free (sizeof (_M_i), &_M_i); } + { return __atomic_always_lock_free(sizeof(_M_i), &_M_i); } bool is_lock_free() const volatile noexcept - { return __atomic_is_lock_free (sizeof (_M_i), &_M_i); } + { return __atomic_always_lock_free(sizeof(_M_i), &_M_i); } void store(__int_type __i, memory_order __m = memory_order_seq_cst) noexcept @@ -716,11 +716,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION bool is_lock_free() const noexcept - { return __atomic_is_lock_free(_M_type_size(1), &_M_p); } + { return __atomic_always_lock_free(_M_type_size(1), &_M_p); } bool is_lock_free() const volatile noexcept - { return __atomic_is_lock_free(_M_type_size(1), &_M_p); } + { return __atomic_always_lock_free(_M_type_size(1), &_M_p); } void store(__pointer_type __p, diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic index 6a08b28a68a..b5ca60621e5 100644 --- a/libstdc++-v3/include/std/atomic +++ b/libstdc++-v3/include/std/atomic @@ -184,11 +184,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION bool is_lock_free() const noexcept - { return __atomic_is_lock_free(sizeof(_M_i), &_M_i); } + { return __atomic_always_lock_free(sizeof(_M_i), &_M_i); } bool is_lock_free() const volatile noexcept - { return __atomic_is_lock_free(sizeof(_M_i), &_M_i); } + { return __atomic_always_lock_free(sizeof(_M_i), &_M_i); } void store(_Tp __i, memory_order _m = memory_order_seq_cst) noexcept