Skip to content

🐛 Fix make_tuple with function pointers #238

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
elbeno merged 1 commit into from
Jun 11, 2025
Merged

🐛 Fix make_tuple with function pointers #238

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
2 changes: 1 addition & 1 deletion include/stdx/tuple.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ template <typename T, tuplelike Tuple>
}

template <typename... Ts> [[nodiscard]] constexpr auto make_tuple(Ts &&...ts) {
return tuple<std::remove_cvref_t<Ts>...>{std::forward<Ts>(ts)...};
return tuple<std::decay_t<Ts>...>{std::forward<Ts>(ts)...};
}

template <template <typename> typename... Fs>
Expand Down
8 changes: 7 additions & 1 deletion test/tuple.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ TEST_CASE("tuple of lvalue references", "[tuple]") {

TEST_CASE("tuple of lambdas", "[tuple]") {
auto x = 1;
auto t = stdx::make_tuple([&] { x += 2; }, [&] { x += 3; });
auto t = stdx::tuple{[&] { x += 2; }, [&] { x += 3; }};
get<0>(t)();
CHECK(x == 3);
}
Expand Down Expand Up @@ -392,9 +392,15 @@ TEST_CASE("copy/move behavior for tuple", "[tuple]") {
CHECK(counter::copies == 0);
}

auto func_no_args() -> void;
auto func_one_arg(int) -> void;

TEST_CASE("make_tuple", "[tuple]") {
STATIC_REQUIRE(stdx::make_tuple() == stdx::tuple{});
STATIC_REQUIRE(stdx::make_tuple(1, 2, 3) == stdx::tuple{1, 2, 3});
STATIC_REQUIRE(
std::is_same_v<decltype(stdx::make_tuple(func_no_args, func_one_arg)),
stdx::tuple<void (*)(), void (*)(int)>>);

constexpr auto t = stdx::make_tuple(stdx::tuple{});
using T = std::remove_const_t<decltype(t)>;
Expand Down