From bc2da0fc047bad6c0a4e6ea1468d95e590844450 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 9 Oct 2014 19:17:23 +0100 Subject: [PATCH] re PR libstdc++/63322 (std::atomic where T is not trivially copyable should be disabled.) PR libstdc++/63322 * include/std/atomic (atomic): Add assertion for trivially copyable. * testsuite/29_atomics/atomic/60695.cc: Adjust line number. From-SVN: r216046 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/include/std/atomic | 3 ++- libstdc++-v3/testsuite/29_atomics/atomic/60695.cc | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cdf1fc69340..6b4444aa2c5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -3,6 +3,10 @@ * doc/xml/manual/status_cxx2011.xml: Update. * doc/html/manual/status.html: Regenerate. + PR libstdc++/63322 + * include/std/atomic (atomic): Add assertion for trivially copyable. + * testsuite/29_atomics/atomic/60695.cc: Adjust line number. + 2014-10-09 Ville Voutilainen PR libstdc++/60132 diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic index be7d0be051a..85dc252bb46 100644 --- a/libstdc++-v3/include/std/atomic +++ b/libstdc++-v3/include/std/atomic @@ -163,7 +163,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION private: _Tp _M_i; - // TODO: static_assert(is_trivially_copyable<_Tp>::value, ""); + static_assert(__is_trivially_copyable(_Tp), + "std::atomic requires a trivially copyable type"); static_assert(sizeof(_Tp) > 0, "Incomplete or zero-sized types are not supported"); diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/60695.cc b/libstdc++-v3/testsuite/29_atomics/atomic/60695.cc index 27c0c8f59a6..10c5e3adcbe 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic/60695.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic/60695.cc @@ -27,4 +27,4 @@ struct X { char stuff[0]; // GNU extension, type has zero size }; -std::atomic a; // { dg-error "not supported" "" { target *-*-* } 168 } +std::atomic a; // { dg-error "not supported" "" { target *-*-* } 169 } -- 2.30.2