diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2012-08-30 19:24:58 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2012-08-30 19:24:58 +0000 |
| commit | 3e7e2f128b37eb96c621217afc8375b5a72144e3 (patch) | |
| tree | 52fdc256148e50c984339e66d42ce49cd3d7f869 /libstdc++-v3 | |
| parent | 25270f5e5aa6f04e9c1b5cbe484d511b227bcfea (diff) | |
| download | gcc-3e7e2f128b37eb96c621217afc8375b5a72144e3.zip gcc-3e7e2f128b37eb96c621217afc8375b5a72144e3.tar.gz gcc-3e7e2f128b37eb96c621217afc8375b5a72144e3.tar.bz2 | |
PR libstdc++/54005 continued
2012-08-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/54005 continued
* include/std/atomic: Use __atomic_lock_free with
* include/bits/atomic_base.h: Same.
From-SVN: r190810
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/atomic_base.h | 9 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/atomic | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 74ee2f5..9544c2f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -5,6 +5,12 @@ 2012-08-30 Benjamin Kosnik <bkoz@redhat.com> + PR libstdc++/54005 continued + * include/std/atomic: Use __atomic_lock_free with + * include/bits/atomic_base.h: Same. + +2012-08-30 Benjamin Kosnik <bkoz@redhat.com> + * testsuite/util/testsuite_abi.cc (check_version): Add GLIBCXX_3.4.18. 2012-08-29 Ulrich Drepper <drepper@gmail.com> diff --git a/libstdc++-v3/include/bits/atomic_base.h b/libstdc++-v3/include/bits/atomic_base.h index 598e1f1..de098a3 100644 --- a/libstdc++-v3/include/bits/atomic_base.h +++ b/libstdc++-v3/include/bits/atomic_base.h @@ -35,6 +35,7 @@ #include <bits/c++config.h> #include <stdbool.h> #include <stdint.h> +#include <cstddef> #include <bits/atomic_lockfree_defines.h> namespace std _GLIBCXX_VISIBILITY(default) @@ -422,11 +423,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION bool is_lock_free() const noexcept - { return __atomic_always_lock_free(sizeof(_M_i), &_M_i); } + { return __atomic_is_lock_free(sizeof(_M_i), NULL); } bool is_lock_free() const volatile noexcept - { return __atomic_always_lock_free(sizeof(_M_i), &_M_i); } + { return __atomic_is_lock_free(sizeof(_M_i), NULL); } void store(__int_type __i, memory_order __m = memory_order_seq_cst) noexcept @@ -716,11 +717,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION bool is_lock_free() const noexcept - { return __atomic_always_lock_free(_M_type_size(1), &_M_p); } + { return __atomic_is_lock_free(_M_type_size(1), NULL); } bool is_lock_free() const volatile noexcept - { return __atomic_always_lock_free(_M_type_size(1), &_M_p); } + { return __atomic_is_lock_free(_M_type_size(1), NULL); } void store(__pointer_type __p, diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic index b5ca606..535a90f 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_always_lock_free(sizeof(_M_i), &_M_i); } + { return __atomic_is_lock_free(sizeof(_M_i), NULL); } bool is_lock_free() const volatile noexcept - { return __atomic_always_lock_free(sizeof(_M_i), &_M_i); } + { return __atomic_is_lock_free(sizeof(_M_i), NULL); } void store(_Tp __i, memory_order _m = memory_order_seq_cst) noexcept |