Skip to content
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

Fix tuple + indexable_container combiner #2163

Merged
merged 1 commit into from
Dec 21, 2023
Merged

Fix tuple + indexable_container combiner #2163

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
6 changes: 3 additions & 3 deletions pythran/pythonic/include/types/tuple.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,15 +812,15 @@ struct __combined<container<t>, std::tuple<t0...>> {
PYTHONIC_NS_BEGIN
namespace details
{
template <class T, class P, bool Same>
template <class T, class P, bool Combine>
struct pick_combined;
template <class T, class P>
struct pick_combined<T, P, true> {
using type = typename __combined<T, P>::type;
};
template <class T, class P>
struct pick_combined<T, P, false> {
using type = P;
using type = T;
};
} // namespace details
PYTHONIC_NS_END
Expand All @@ -831,7 +831,7 @@ struct __combined<std::tuple<t0...>,
using holder = std::tuple<t0...>;
template <size_t... Is>
static std::tuple<typename pythonic::details::pick_combined<
t, typename std::tuple_element<Is, holder>::type, I == Is>::type...>
typename std::tuple_element<Is, holder>::type, t, I == Is>::type...>
make_type(pythonic::utils::index_sequence<Is...>);
static auto make_type() -> decltype(make_type(
pythonic::utils::make_index_sequence<sizeof...(t0)>()));
Expand Down
Loading