Move to C++14: Move to std::get<type>(..) instead of xsimd::detail::get

serge-sans-paille · serge-sans-paille · commit bf33b7b98345 · 2025-12-02T13:06:06.000+01:00
diff --git a/include/xsimd/arch/xsimd_neon.hpp b/include/xsimd/arch/xsimd_neon.hpp
@@ -169,7 +169,7 @@ namespace xsimd
                     return_type<U> apply(U rhs) const noexcept
                     {
                         using func_type = return_type<U> (*)(U);
-                        auto func = xsimd::detail::get<func_type>(m_func);
+                        auto func = std::get<func_type>(m_func);
                         return func(rhs);
                     }
                 };
@@ -183,7 +183,7 @@ namespace xsimd
                     return_type<U> apply(U lhs, U rhs) const noexcept
                     {
                         using func_type = return_type<U> (*)(U, U);
-                        auto func = xsimd::detail::get<func_type>(m_func);
+                        auto func = std::get<func_type>(m_func);
                         return func(lhs, rhs);
                     }
                 };
@@ -1866,7 +1866,7 @@ namespace xsimd
                 U apply(comp_return_type<U> cond, U lhs, U rhs) const noexcept
                 {
                     using func_type = U (*)(comp_return_type<U>, U, U);
-                    auto func = xsimd::detail::get<func_type>(m_func);
+                    auto func = std::get<func_type>(m_func);
                     return func(cond, lhs, rhs);
                 }
             };
@@ -2886,7 +2886,7 @@ namespace xsimd
                 R apply(U rhs) const noexcept
                 {
                     using func_type = R (*)(U);
-                    auto func = xsimd::detail::get<func_type>(m_func);
+                    auto func = std::get<func_type>(m_func);
                     return func(rhs);
                 }
             };
@@ -2915,7 +2915,7 @@ namespace xsimd
                 V apply(U rhs) const noexcept
                 {
                     using caster_type = bitwise_caster_impl<V, T...>;
-                    auto caster = xsimd::detail::get<caster_type>(m_caster);
+                    auto caster = std::get<caster_type>(m_caster);
                     return caster.apply(rhs);
                 }
             };
diff --git a/include/xsimd/arch/xsimd_neon64.hpp b/include/xsimd/arch/xsimd_neon64.hpp
@@ -1241,7 +1241,7 @@ namespace xsimd
                 V apply(float64x2_t rhs) const
                 {
                     using func_type = V (*)(float64x2_t);
-                    auto func = xsimd::detail::get<func_type>(m_func);
+                    auto func = std::get<func_type>(m_func);
                     return func(rhs);
                 }
             };
diff --git a/include/xsimd/types/xsimd_utils.hpp b/include/xsimd/types/xsimd_utils.hpp
@@ -280,33 +280,6 @@ namespace xsimd
         }
     }
 
-    /***********************************
-     * Backport of std::get from C++14 *
-     ***********************************/
-
-    namespace detail
-    {
-        template <class T, class... Types, size_t I, size_t... Is>
-        inline const T& get_impl(const std::tuple<Types...>& t, std::is_same<T, T>, std::index_sequence<I, Is...>) noexcept
-        {
-            return std::get<I>(t);
-        }
-
-        template <class T, class U, class... Types, size_t I, size_t... Is>
-        inline const T& get_impl(const std::tuple<Types...>& t, std::is_same<T, U>, std::index_sequence<I, Is...>) noexcept
-        {
-            using tuple_elem = typename std::tuple_element<I + 1, std::tuple<Types...>>::type;
-            return get_impl<T>(t, std::is_same<T, tuple_elem>(), std::index_sequence<Is...>());
-        }
-
-        template <class T, class... Types>
-        inline const T& get(const std::tuple<Types...>& t) noexcept
-        {
-            using tuple_elem = typename std::tuple_element<0, std::tuple<Types...>>::type;
-            return get_impl<T>(t, std::is_same<T, tuple_elem>(), std::make_index_sequence<sizeof...(Types)>());
-        }
-    }
-
     /*********************************
      * Backport of void_t from C++17 *
      *********************************/

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ namespace xsimd`
`169`	`169`	`return_type<U> apply(U rhs) const noexcept`
`170`	`170`	`{`
`171`	`171`	`using func_type = return_type<U> (*)(U);`
`172`		`- auto func = xsimd::detail::get<func_type>(m_func);`
	`172`	`+ auto func = std::get<func_type>(m_func);`
`173`	`173`	`return func(rhs);`
`174`	`174`	`}`
`175`	`175`	`};`
`@@ -183,7 +183,7 @@ namespace xsimd`
`183`	`183`	`return_type<U> apply(U lhs, U rhs) const noexcept`
`184`	`184`	`{`
`185`	`185`	`using func_type = return_type<U> (*)(U, U);`
`186`		`- auto func = xsimd::detail::get<func_type>(m_func);`
	`186`	`+ auto func = std::get<func_type>(m_func);`
`187`	`187`	`return func(lhs, rhs);`
`188`	`188`	`}`
`189`	`189`	`};`
`@@ -1866,7 +1866,7 @@ namespace xsimd`
`1866`	`1866`	`U apply(comp_return_type<U> cond, U lhs, U rhs) const noexcept`
`1867`	`1867`	`{`
`1868`	`1868`	`using func_type = U (*)(comp_return_type<U>, U, U);`
`1869`		`- auto func = xsimd::detail::get<func_type>(m_func);`
	`1869`	`+ auto func = std::get<func_type>(m_func);`
`1870`	`1870`	`return func(cond, lhs, rhs);`
`1871`	`1871`	`}`
`1872`	`1872`	`};`
`@@ -2886,7 +2886,7 @@ namespace xsimd`
`2886`	`2886`	`R apply(U rhs) const noexcept`
`2887`	`2887`	`{`
`2888`	`2888`	`using func_type = R (*)(U);`
`2889`		`- auto func = xsimd::detail::get<func_type>(m_func);`
	`2889`	`+ auto func = std::get<func_type>(m_func);`
`2890`	`2890`	`return func(rhs);`
`2891`	`2891`	`}`
`2892`	`2892`	`};`
`@@ -2915,7 +2915,7 @@ namespace xsimd`
`2915`	`2915`	`V apply(U rhs) const noexcept`
`2916`	`2916`	`{`
`2917`	`2917`	`using caster_type = bitwise_caster_impl<V, T...>;`
`2918`		`- auto caster = xsimd::detail::get<caster_type>(m_caster);`
	`2918`	`+ auto caster = std::get<caster_type>(m_caster);`
`2919`	`2919`	`return caster.apply(rhs);`
`2920`	`2920`	`}`
`2921`	`2921`	`};`
Original file line number	Diff line number	Diff line change
`@@ -1241,7 +1241,7 @@ namespace xsimd`
`1241`	`1241`	`V apply(float64x2_t rhs) const`
`1242`	`1242`	`{`
`1243`	`1243`	`using func_type = V (*)(float64x2_t);`
`1244`		`- auto func = xsimd::detail::get<func_type>(m_func);`
	`1244`	`+ auto func = std::get<func_type>(m_func);`
`1245`	`1245`	`return func(rhs);`
`1246`	`1246`	`}`
`1247`	`1247`	`};`