commit 3a7f3e87680cc0ca20318b0983d517cd32851fc5 Author: Jonathan Wakely Date: Wed Nov 13 22:27:59 2019 +0000 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. diff --git a/libstdc++-v3/include/bits/iterator_concepts.h b/libstdc++-v3/include/bits/iterator_concepts.h index 8b398616a56..7cc058eb8c9 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 - inline constexpr bool disable_sized_sentinel = false; + inline constexpr bool disable_sized_sentinel_for = false; template concept sized_sentinel_for = sentinel_for<_Sent, _Iter> - && !disable_sized_sentinel, remove_cv_t<_Iter>> + && !disable_sized_sentinel_for, remove_cv_t<_Iter>> && requires(const _Iter& __i, const _Sent& __s) { { __s - __i } -> same_as>; diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index 411feba90e0..a707621c9ed 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 requires (!sized_sentinel_for<_Iterator1, _Iterator2>) - inline constexpr bool disable_sized_sentinel, - reverse_iterator<_Iterator2>> - = true; + inline constexpr bool + disable_sized_sentinel_for, + 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 824b0b4f38c..fb3bb420a54 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 = true; +template<> constexpr bool std::disable_sized_sentinel_for = 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; + constexpr bool const* disable_sized_sentinel_for + = &std::disable_sized_sentinel_for; // default sentinels constexpr std::default_sentinel_t const* default_sentinel = &std::default_sentinel;