@@ -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>>;
@@ -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
@@ -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;