diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2012-08-07 23:03:55 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2012-08-07 23:03:55 +0000 |
| commit | 743ca87fe8fdad0d8246c7f91a3b374be74e398c (patch) | |
| tree | cb102054226eee5797ea4d62ee2fe29748ec495c /libstdc++-v3 | |
| parent | f8923f7ead7d79efb6971dfb645d137ed8c2c649 (diff) | |
| download | gcc-743ca87fe8fdad0d8246c7f91a3b374be74e398c.zip gcc-743ca87fe8fdad0d8246c7f91a3b374be74e398c.tar.gz gcc-743ca87fe8fdad0d8246c7f91a3b374be74e398c.tar.bz2 | |
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 <bkoz@redhat.com>
PR libstdc++/54005
* include/std/atomic: Use __atomic_always_lock_free.
* include/bits/atomic_base.h: Same.
From-SVN: r190216
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/atomic_base.h | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/atomic | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3bd4ea3..53fb00f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2012-08-07 Benjamin Kosnik <bkoz@redhat.com> + + PR libstdc++/54005 + * include/std/atomic: Use __atomic_always_lock_free. + * include/bits/atomic_base.h: Same. + 2012-08-06 Paolo Carlini <paolo.carlini@oracle.com> * 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 9d5f4eb..598e1f1 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 6a08b28..b5ca606 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 |