diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2022-06-13 16:36:14 +0100 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2022-06-14 20:29:48 +0100 |
commit | d10b3b5c1f61c05b3cf1229d0bd961db3f8ee653 (patch) | |
tree | 5036a227fa1f863b7813ccd021ab2b00225e1a94 /libstdc++-v3 | |
parent | d1201dbf55a11d391030914985ba6b443e59baa5 (diff) |
libstdc++: Use type_identity_t for non-deducible std::atomic_xxx args
This is LWG 3220 which is about to become Tentatively Ready.
libstdc++-v3/ChangeLog:
* include/std/atomic (__atomic_val_t): Use __type_identity_t
instead of atomic<T>::value_type, as per LWG 3220.
* testsuite/29_atomics/atomic/lwg3220.cc: New test.
(cherry picked from commit 30cc1b65e4efa1a2c57fec5574fcae7a446b822f)
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/include/std/atomic | 5 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/29_atomics/atomic/lwg3220.cc | 13 |
2 files changed, 16 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic index d819b6bf41e..cf5d7309334 100644 --- a/libstdc++-v3/include/std/atomic +++ b/libstdc++-v3/include/std/atomic @@ -1241,9 +1241,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION atomic_flag_clear(volatile atomic_flag* __a) noexcept { atomic_flag_clear_explicit(__a, memory_order_seq_cst); } - + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 3220. P0558 broke conforming C++14 uses of atomic shared_ptr template<typename _Tp> - using __atomic_val_t = typename atomic<_Tp>::value_type; + using __atomic_val_t = __type_identity_t<_Tp>; template<typename _Tp> using __atomic_diff_t = typename atomic<_Tp>::difference_type; diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/lwg3220.cc b/libstdc++-v3/testsuite/29_atomics/atomic/lwg3220.cc new file mode 100644 index 00000000000..d2ff6cf9fe3 --- /dev/null +++ b/libstdc++-v3/testsuite/29_atomics/atomic/lwg3220.cc @@ -0,0 +1,13 @@ +// { dg-do compile { target c++11 } } +// DR 3220. P0558 broke conforming C++14 uses of atomic shared_ptr + +#include <atomic> +#include <memory> + +struct Abstract { virtual void test() = 0; }; +struct Concrete : Abstract { virtual void test() override {} }; + +int main() { + std::shared_ptr<Abstract> ptr; + std::atomic_store<Abstract>(&ptr, std::make_shared<Concrete>()); +} |