Skip to content

<ranges>: Fix regression with ranges::to for ADL-only begin/end #5173

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
Stephan T. Lavavej (StephanTLavavej) merged 2 commits into from
Dec 13, 2024
Merged

<ranges>: Fix regression with ranges::to for ADL-only begin/end #5173

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
8624d1e
Fix regression with `ranges::to` for ADL-only `begin`/`end`
frederick-vs-ja Dec 9, 2024
0363996
Make `_Sent` `const`
frederick-vs-ja Dec 10, 2024
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
6 changes: 5 additions & 1 deletion stl/inc/__msvc_ranges_to.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,11 @@ namespace ranges {
if constexpr (_Sized_and_reservable<_Rng, _Container>) {
_Cont.reserve(static_cast<range_size_t<_Container>>(_RANGES size(_Range)));
}
for (auto&& _Elem : _Range) {

auto _Iter = _RANGES begin(_Range);
const auto _Sent = _RANGES end(_Range);
for (; _Iter != _Sent; ++_Iter) {
auto&& _Elem = *_Iter;
using _ElemTy = decltype(_Elem);
if constexpr (_Can_emplace_back<_Container, _ElemTy>) {
_Cont.emplace_back(_STD forward<_ElemTy>(_Elem));
Expand Down
27 changes: 27 additions & 0 deletions tests/std/tests/P1206R7_ranges_to_misc/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,30 @@ constexpr bool test_lwg4016() {
return true;
}

struct adl_only_range {
static constexpr int numbers[2]{42, 1729};

void begin() const = delete;
void end() const = delete;

friend constexpr const int* begin(const adl_only_range&) {
return ranges::begin(numbers);
}
friend constexpr const int* end(const adl_only_range&) {
return ranges::end(numbers);
}
};

constexpr bool test_lwg4016_regression() {
using vec = restricted_vector<restriction_kind::push_back, int>;

ranges::contiguous_range auto r = adl_only_range{};
auto v = r | ranges::to<vec>();
assert(ranges::equal(v, adl_only_range::numbers));

return true;
}

int main() {
test_reservable();
static_assert(test_reservable());
Expand All @@ -356,4 +380,7 @@ int main() {

test_lwg4016();
static_assert(test_lwg4016());

test_lwg4016_regression();
static_assert(test_lwg4016_regression());
}