From 2a4aa7ebf66453f59547381b54b529616d761222 Mon Sep 17 00:00:00 2001
From: serge-sans-paille <serge.guelton@telecom-bretagne.eu>
Date: Thu, 14 Dec 2023 22:49:41 +0100
Subject: [PATCH] Fix tuple + indexable_container combiner

The order of the combination matters, and it wasn't respected.

Fix #2160
---
 pythran/pythonic/include/types/tuple.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pythran/pythonic/include/types/tuple.hpp b/pythran/pythonic/include/types/tuple.hpp
index ce7aa8972..40c6f55a9 100644
--- a/pythran/pythonic/include/types/tuple.hpp
+++ b/pythran/pythonic/include/types/tuple.hpp
@@ -812,7 +812,7 @@ 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> {
@@ -820,7 +820,7 @@ namespace details
   };
   template <class T, class P>
   struct pick_combined<T, P, false> {
-    using type = P;
+    using type = T;
   };
 } // namespace details
 PYTHONIC_NS_END
@@ -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)>()));