diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2020-02-17 13:20:57 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2020-02-17 13:20:57 +0000 |
| commit | d6dfa3dafc0a69a84002f1c0be17a70b0996cc72 (patch) | |
| tree | 8e18f95066d691cb55ca20e122bb82b9d6221038 | |
| parent | 98cf2c265962e260f2f95617983915c754f446ea (diff) | |
| download | gcc-d6dfa3dafc0a69a84002f1c0be17a70b0996cc72.zip gcc-d6dfa3dafc0a69a84002f1c0be17a70b0996cc72.tar.gz gcc-d6dfa3dafc0a69a84002f1c0be17a70b0996cc72.tar.bz2 | |
libstdc++: Make "implicit expression variants" more explicit (P2102R0)
* include/bits/iterator_concepts.h (indirectly_copyable_storable): Add
const-qualified expression variations.
* include/std/concepts (copyable): Likewise.
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/iterator_concepts.h | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/concepts | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2dca4b5..c966008 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2020-02-17 Jonathan Wakely <jwakely@redhat.com> + * include/bits/iterator_concepts.h (indirectly_copyable_storable): Add + const-qualified expression variations. + * include/std/concepts (copyable): Likewise. + * include/std/type_traits (__is_standard_integer): New helper trait. * include/std/utility (cmp_equal, cmp_not_equal, cmp_less, cmp_greater) (cmp_less_equal, cmp_greater_equal, in_range): Define for C++20. diff --git a/libstdc++-v3/include/bits/iterator_concepts.h b/libstdc++-v3/include/bits/iterator_concepts.h index 04c862a..792b326 100644 --- a/libstdc++-v3/include/bits/iterator_concepts.h +++ b/libstdc++-v3/include/bits/iterator_concepts.h @@ -693,7 +693,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _In, typename _Out> concept indirectly_copyable_storable = indirectly_copyable<_In, _Out> + && indirectly_writable<_Out, iter_value_t<_In>&> && indirectly_writable<_Out, const iter_value_t<_In>&> + && indirectly_writable<_Out, iter_value_t<_In>&&> + && indirectly_writable<_Out, const iter_value_t<_In>&&> && copyable<iter_value_t<_In>> && constructible_from<iter_value_t<_In>, iter_reference_t<_In>> && assignable_from<iter_value_t<_In>&, iter_reference_t<_In>>; diff --git a/libstdc++-v3/include/std/concepts b/libstdc++-v3/include/std/concepts index db61489..acc9dd2 100644 --- a/libstdc++-v3/include/std/concepts +++ b/libstdc++-v3/include/std/concepts @@ -251,7 +251,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Tp> concept copyable = copy_constructible<_Tp> && movable<_Tp> - && assignable_from<_Tp&, const _Tp&>; + && assignable_from<_Tp&, _Tp&> && assignable_from<_Tp&, const _Tp&> + && assignable_from<_Tp&, const _Tp>; template<typename _Tp> concept semiregular = copyable<_Tp> && default_initializable<_Tp>; |