Skip to content

Render keys_view and values_view useless per LWG-3563 #2426

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

Merged
StephanTLavavej merged 1 commit into from
Jan 20, 2022
Merged

Render keys_view and values_view useless per LWG-3563 #2426

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 @@ -4717,9 +4717,9 @@ namespace ranges {
inline constexpr bool enable_borrowed_range<elements_view<_Rng, _Index>> = enable_borrowed_range<_Rng>;

template <class _Rng>
using keys_view = elements_view<views::all_t<_Rng>, 0>;
using keys_view = elements_view<_Rng, 0>;
template <class _Rng>
using values_view = elements_view<views::all_t<_Rng>, 1>;
using values_view = elements_view<_Rng, 1>;

namespace views {
template <size_t _Index>
Expand Down
8 changes: 4 additions & 4 deletions tests/std/tests/P0896R4_views_elements/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,11 @@ constexpr bool test_one(Rng&& rng) {
// Validate content
assert(ranges::equal(r, expected_keys));

// Validate keys_view and values_view
STATIC_ASSERT(same_as<ranges::keys_view<Rng>, R>);
STATIC_ASSERT(same_as<ranges::values_view<Rng>, elements_view<V, 1>>);
// Validate views::keys and views::values
STATIC_ASSERT(same_as<decltype(views::keys(rng)), R>);
STATIC_ASSERT(same_as<decltype(views::values(rng)), elements_view<V, 1>>);
if constexpr (forward_range<Rng> && is_lvalue_reference_v<Rng>) {
assert(ranges::equal(ranges::values_view<Rng>{rng}, expected_values));
assert(ranges::equal(views::values(rng), expected_values));
}

// Validate elements_view::begin
Expand Down