diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2019-11-14 16:53:03 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2019-11-14 16:53:03 +0000 |
| commit | d99828eea22b6ae852f993ce8732d686faf63c95 (patch) | |
| tree | 469db426b3e23d0b6e194048420cbc8e636dac23 | |
| parent | d19df8b22998766fec1d3c3af055639ba2d172e5 (diff) | |
| download | gcc-d99828eea22b6ae852f993ce8732d686faf63c95.zip gcc-d99828eea22b6ae852f993ce8732d686faf63c95.tar.gz gcc-d99828eea22b6ae852f993ce8732d686faf63c95.tar.bz2 | |
libstdc++: Rename disable_sized_sentinel [P1871R1]
* include/bits/iterator_concepts.h (disable_sized_sentinel): Rename to
disable_sized_sentinel_for.
* testsuite/24_iterators/headers/iterator/synopsis_c++20.cc: Adjust.
From-SVN: r278255
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/iterator_concepts.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_iterator.h | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/24_iterators/headers/iterator/synopsis_c++20.cc | 6 |
4 files changed, 14 insertions, 8 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b073c68..75f4eeb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2019-11-14 Jonathan Wakely <jwakely@redhat.com> + + * include/bits/iterator_concepts.h (disable_sized_sentinel): Rename to + disable_sized_sentinel_for. + * testsuite/24_iterators/headers/iterator/synopsis_c++20.cc: Adjust. + 2019-11-13 Jonathan Wakely <jwakely@redhat.com> * libsupc++/compare (strong_order, weak_order, partial_order) diff --git a/libstdc++-v3/include/bits/iterator_concepts.h b/libstdc++-v3/include/bits/iterator_concepts.h index 8b39861..7cc058e 100644 --- a/libstdc++-v3/include/bits/iterator_concepts.h +++ b/libstdc++-v3/include/bits/iterator_concepts.h @@ -524,11 +524,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION && __detail::__weakly_eq_cmp_with<_Sent, _Iter>; template<typename _Sent, typename _Iter> - inline constexpr bool disable_sized_sentinel = false; + inline constexpr bool disable_sized_sentinel_for = false; template<typename _Sent, typename _Iter> concept sized_sentinel_for = sentinel_for<_Sent, _Iter> - && !disable_sized_sentinel<remove_cv_t<_Sent>, remove_cv_t<_Iter>> + && !disable_sized_sentinel_for<remove_cv_t<_Sent>, remove_cv_t<_Iter>> && requires(const _Iter& __i, const _Sent& __s) { { __s - __i } -> same_as<iter_difference_t<_Iter>>; diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index 411feba..a707621 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -449,9 +449,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION # if __cplusplus > 201703L && defined __cpp_lib_concepts template<typename _Iterator1, typename _Iterator2> requires (!sized_sentinel_for<_Iterator1, _Iterator2>) - inline constexpr bool disable_sized_sentinel<reverse_iterator<_Iterator1>, - reverse_iterator<_Iterator2>> - = true; + inline constexpr bool + disable_sized_sentinel_for<reverse_iterator<_Iterator1>, + reverse_iterator<_Iterator2>> = true; # endif // C++20 # endif // C++14 diff --git a/libstdc++-v3/testsuite/24_iterators/headers/iterator/synopsis_c++20.cc b/libstdc++-v3/testsuite/24_iterators/headers/iterator/synopsis_c++20.cc index 824b0b4..fb3bb42 100644 --- a/libstdc++-v3/testsuite/24_iterators/headers/iterator/synopsis_c++20.cc +++ b/libstdc++-v3/testsuite/24_iterators/headers/iterator/synopsis_c++20.cc @@ -79,7 +79,7 @@ namespace std } struct I { }; -template<> constexpr bool std::disable_sized_sentinel<I, I> = true; +template<> constexpr bool std::disable_sized_sentinel_for<I, I> = true; namespace __gnu_test { @@ -87,8 +87,8 @@ namespace __gnu_test constexpr auto* iter_move = &std::ranges::iter_move; constexpr auto* iter_swap = &std::ranges::iter_swap; // sized sentinels - constexpr bool const* disable_sized_sentinel - = &std::disable_sized_sentinel<void, void>; + constexpr bool const* disable_sized_sentinel_for + = &std::disable_sized_sentinel_for<void, void>; // default sentinels constexpr std::default_sentinel_t const* default_sentinel = &std::default_sentinel; |