diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2020-08-25 15:52:57 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2020-08-25 15:52:57 +0100 |
| commit | 71ed3c0c9a3458998bded8e2443c0a680c2eb8cd (patch) | |
| tree | 336a9eee4e2608b730baf5e190d306fe9dcbd0bc /libstdc++-v3/include/std/future | |
| parent | 03d5044b31f7bf94fcda4136b4ed87a5fee7735d (diff) | |
| download | gcc-71ed3c0c9a3458998bded8e2443c0a680c2eb8cd.zip gcc-71ed3c0c9a3458998bded8e2443c0a680c2eb8cd.tar.gz gcc-71ed3c0c9a3458998bded8e2443c0a680c2eb8cd.tar.bz2 | |
libstdc++: Adjust static assertions in futures and promises [LWG 3466]
Add a static_assertions to check the result type is destructible, as in
the proposed resolution for LWG 3466 (which supersedes 3458).
libstdc++-v3/ChangeLog:
* include/std/future (future, shared_future. promise): Add
is_destructible assertion (LWG 3466). Adjust string-literal for
!is_array and !is_function assertions.
* testsuite/30_threads/future/requirements/lwg3458.cc: Check
types with no accessible destructor. Adjust expected errors.
* testsuite/30_threads/promise/requirements/lwg3466.cc:
Likewise.
* testsuite/30_threads/shared_future/requirements/lwg3458.cc:
Likewise.
Diffstat (limited to 'libstdc++-v3/include/std/future')
| -rw-r--r-- | libstdc++-v3/include/std/future | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index e0816c2..a7466a32 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -757,8 +757,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { // _GLIBCXX_RESOLVE_LIB_DEFECTS // 3458. Is shared_future intended to work with arrays or function types? - static_assert(!is_array<_Res>{}, "result type is not an array"); - static_assert(!is_function<_Res>{}, "result type is not a function"); + static_assert(!is_array<_Res>{}, "result type must not be an array"); + static_assert(!is_function<_Res>{}, "result type must not be a function"); + static_assert(is_destructible<_Res>{}, + "result type must be destructible"); friend class promise<_Res>; template<typename> friend class packaged_task; @@ -892,8 +894,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { // _GLIBCXX_RESOLVE_LIB_DEFECTS // 3458. Is shared_future intended to work with arrays or function types? - static_assert(!is_array<_Res>{}, "result type is not an array"); - static_assert(!is_function<_Res>{}, "result type is not a function"); + static_assert(!is_array<_Res>{}, "result type must not be an array"); + static_assert(!is_function<_Res>{}, "result type must not be a function"); + static_assert(is_destructible<_Res>{}, + "result type must be destructible"); typedef __basic_future<_Res> _Base_type; @@ -1049,8 +1053,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { // _GLIBCXX_RESOLVE_LIB_DEFECTS // 3466: Specify the requirements for promise/future/[...] consistently - static_assert(!is_array<_Res>{}, "result type is not an array"); - static_assert(!is_function<_Res>{}, "result type is not a function"); + static_assert(!is_array<_Res>{}, "result type must not be an array"); + static_assert(!is_function<_Res>{}, "result type must not be a function"); + static_assert(is_destructible<_Res>{}, + "result type must be destructible"); typedef __future_base::_State_base _State; typedef __future_base::_Result<_Res> _Res_type; |