Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement LWG-3946 The definition of const_iterator_t should be reworked #4187

Merged
merged 1 commit into from
Nov 17, 2023
Merged

Implement LWG-3946 The definition of const_iterator_t should be reworked #4187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions stl/inc/ranges
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ namespace ranges {

#if _HAS_CXX23
_EXPORT_STD template <range _Rng>
using const_iterator_t = const_iterator<iterator_t<_Rng>>;
using const_iterator_t = decltype(_RANGES cbegin(_STD declval<_Rng&>()));

_EXPORT_STD template <range _Rng>
using const_sentinel_t = const_sentinel<sentinel_t<_Rng>>;
using const_sentinel_t = decltype(_RANGES cend(_STD declval<_Rng&>()));

_EXPORT_STD template <range _Rng>
using range_const_reference_t = iter_const_reference_t<iterator_t<_Rng>>;
Expand Down
20 changes: 10 additions & 10 deletions tests/std/tests/P2278R4_ranges_const_range_machinery/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ namespace test_array {
static_assert(CanRangeConstIterator<Arr>);
static_assert(CanRangeConstSentinel<Arr>);
static_assert(CanRangeConstReference<Arr>);
static_assert(same_as<ranges::const_iterator_t<Arr>, const_iterator<int*>>);
static_assert(same_as<ranges::const_sentinel_t<Arr>, const_iterator<int*>>);
static_assert(same_as<ranges::const_iterator_t<Arr>, const int*>);
static_assert(same_as<ranges::const_sentinel_t<Arr>, const int*>);
static_assert(same_as<ranges::range_const_reference_t<Arr>, const int&>);
static_assert(!ranges::constant_range<Arr>);

Expand All @@ -56,8 +56,8 @@ namespace test_random_access_range {
static_assert(CanRangeConstIterator<Rng>);
static_assert(CanRangeConstSentinel<Rng>);
static_assert(CanRangeConstReference<Rng>);
static_assert(same_as<ranges::const_iterator_t<Rng>, const_iterator<Rng::iterator>>);
static_assert(same_as<ranges::const_sentinel_t<Rng>, const_iterator<Rng::iterator>>);
static_assert(same_as<ranges::const_iterator_t<Rng>, Rng::const_iterator>);
static_assert(same_as<ranges::const_sentinel_t<Rng>, Rng::const_iterator>);
static_assert(same_as<ranges::range_const_reference_t<Rng>, const int&>);
static_assert(!ranges::constant_range<Rng>);

Expand All @@ -76,8 +76,8 @@ namespace test_bidirectional_range {
static_assert(CanRangeConstIterator<Rng>);
static_assert(CanRangeConstSentinel<Rng>);
static_assert(CanRangeConstReference<Rng>);
static_assert(same_as<ranges::const_iterator_t<Rng>, const_iterator<Rng::iterator>>);
static_assert(same_as<ranges::const_sentinel_t<Rng>, const_iterator<Rng::iterator>>);
static_assert(same_as<ranges::const_iterator_t<Rng>, Rng::const_iterator>);
static_assert(same_as<ranges::const_sentinel_t<Rng>, Rng::const_iterator>);
static_assert(same_as<ranges::range_const_reference_t<Rng>, const int&>);
static_assert(!ranges::constant_range<Rng>);

Expand All @@ -96,8 +96,8 @@ namespace test_forward_range {
static_assert(CanRangeConstIterator<Rng>);
static_assert(CanRangeConstSentinel<Rng>);
static_assert(CanRangeConstReference<Rng>);
static_assert(same_as<ranges::const_iterator_t<Rng>, const_iterator<Rng::iterator>>);
static_assert(same_as<ranges::const_sentinel_t<Rng>, const_iterator<Rng::iterator>>);
static_assert(same_as<ranges::const_iterator_t<Rng>, Rng::const_iterator>);
static_assert(same_as<ranges::const_sentinel_t<Rng>, Rng::const_iterator>);
static_assert(same_as<ranges::range_const_reference_t<Rng>, const int&>);
static_assert(!ranges::constant_range<Rng>);

Expand Down Expand Up @@ -147,8 +147,8 @@ namespace test_vector_bool {
static_assert(CanRangeConstIterator<Vb>);
static_assert(CanRangeConstSentinel<Vb>);
static_assert(CanRangeConstReference<Vb>);
static_assert(same_as<ranges::const_iterator_t<Vb>, const_iterator<Vb::iterator>>);
static_assert(same_as<ranges::const_sentinel_t<Vb>, const_iterator<Vb::iterator>>);
static_assert(same_as<ranges::const_iterator_t<Vb>, Vb::const_iterator>);
static_assert(same_as<ranges::const_sentinel_t<Vb>, Vb::const_iterator>);
static_assert(same_as<ranges::range_const_reference_t<Vb>, bool>);
static_assert(!ranges::constant_range<Vb>);

Expand Down