Skip to content

[ADT] Use adl_being/end in map_range #130508

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
merged 1 commit into from
Mar 12, 2025
Merged

[ADT] Use adl_being/end in map_range #130508

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
3 changes: 1 addition & 2 deletions llvm/include/llvm/ADT/STLExtras.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,7 @@ inline mapped_iterator<ItTy, FuncTy> map_iterator(ItTy I, FuncTy F) {

template <class ContainerTy, class FuncTy>
auto map_range(ContainerTy &&C, FuncTy F) {
return make_range(map_iterator(std::begin(C), F),
map_iterator(std::end(C), F));
return make_range(map_iterator(adl_begin(C), F), map_iterator(adl_end(C), F));
}

/// A base type of mapped iterator, that is useful for building derived
Expand Down
12 changes: 12 additions & 0 deletions llvm/unittests/ADT/STLExtrasTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,18 @@ TEST(STLExtrasTest, DropEndDefaultTest) {
EXPECT_EQ(i, 4);
}

TEST(STLExtrasTest, MapRangeTest) {
SmallVector<int, 5> Vec{0, 1, 2};
EXPECT_THAT(map_range(Vec, [](int V) { return V + 1; }),
ElementsAre(1, 2, 3));

// Make sure that we use the `begin`/`end` functions
// from `some_namespace`, using ADL.
some_namespace::some_struct S;
S.data = {3, 4, 5};
EXPECT_THAT(map_range(S, [](int V) { return V * 2; }), ElementsAre(6, 8, 10));
}

TEST(STLExtrasTest, EarlyIncrementTest) {
std::list<int> L = {1, 2, 3, 4};

Expand Down
Loading