Skip to content

Fix error in take_view::begin by casting to the appropriate size #1844

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 2 commits into from
May 1, 2021
Merged

Fix error in take_view::begin by casting to the appropriate size #1844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ac5af4
Fix error in take_view::begin by casting to the appropriate size
miscco Apr 16, 2021
edb6cb3
Cite DevCom database.
StephanTLavavej Apr 28, 2021
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 @@ -1927,7 +1927,7 @@ namespace ranges {
if constexpr (random_access_range<_Vw>) {
return _RANGES begin(_Range);
} else {
const auto _Size = size();
const auto _Size = static_cast<range_difference_t<_Vw>>(size());
return counted_iterator{_RANGES begin(_Range), _Size};
}
} else {
Expand All @@ -1940,7 +1940,7 @@ namespace ranges {
if constexpr (random_access_range<const _Vw>) {
return _RANGES begin(_Range);
} else {
const auto _Size = size();
const auto _Size = static_cast<range_difference_t<_Vw>>(size());
return counted_iterator{_RANGES begin(_Range), _Size};
}
} else {
Expand Down
10 changes: 10 additions & 0 deletions tests/std/tests/P0896R4_views_take/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <algorithm>
#include <cassert>
#include <forward_list>
#include <map>
#include <ranges>
#include <span>
#include <string_view>
Expand Down Expand Up @@ -510,6 +511,13 @@ constexpr void output_range_test() {
}
}

void test_DevCom_1397309() {
constexpr int expected[] = {4, 8};
const map<int, string_view> values{{4, "Hello"sv}, {8, "Beautiful"sv}, {10, "World"sv}};

assert(ranges::equal(values | ranges::views::take(2) | ranges::views::keys, expected));
}

int main() {
// Validate views
{ // ... copyable
Expand Down Expand Up @@ -558,4 +566,6 @@ int main() {

STATIC_ASSERT((instantiation_test(), true));
instantiation_test();

test_DevCom_1397309();
}