From 9cd70cf57b0edda2111ecb6ec8c812f2768f19f7 Mon Sep 17 00:00:00 2001
From: Drew Hubley <dahubley@hotmail.ca>
Date: Mon, 31 Mar 2025 20:22:53 -0300
Subject: [PATCH] Update apply to std 17

---
 include/xtensor/utils/xutils.hpp | 39 ++++++++++++++++----------------
 test/test_xutils.cpp             |  6 ++---
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/include/xtensor/utils/xutils.hpp b/include/xtensor/utils/xutils.hpp
index 7c4989506..cce399a17 100644
--- a/include/xtensor/utils/xutils.hpp
+++ b/include/xtensor/utils/xutils.hpp
@@ -283,29 +283,30 @@ namespace xt
      * apply implementation *
      ************************/
 
-    namespace detail
-    {
-        template <class R, class F, std::size_t I, class... S>
-        R apply_one(F&& func, const std::tuple<S...>& s) NOEXCEPT(noexcept(func(std::get<I>(s))))
-        {
-            return static_cast<R>(func(std::get<I>(s)));
-        }
-
-        template <class R, class F, std::size_t... I, class... S>
-        R apply(std::size_t index, F&& func, std::index_sequence<I...> /*seq*/, const std::tuple<S...>& s)
-            NOEXCEPT(noexcept(func(std::get<0>(s))))
-        {
-            using FT = std::add_pointer_t<R(F&&, const std::tuple<S...>&)>;
-            static const std::array<FT, sizeof...(I)> ar = {{&apply_one<R, F, I, S...>...}};
-            return ar[index](std::forward<F>(func), s);
-        }
-    }
-
     template <class R, class F, class... S>
     inline R apply(std::size_t index, F&& func, const std::tuple<S...>& s)
         NOEXCEPT(noexcept(func(std::get<0>(s))))
     {
-        return detail::apply<R>(index, std::forward<F>(func), std::make_index_sequence<sizeof...(S)>(), s);
+        XTENSOR_ASSERT(sizeof...(S) > index);
+        return std::apply(
+            [&](const S&... args) -> R
+            {
+                auto f_impl = [&](auto&& self, auto&& i, auto&& h, auto&&... t) -> R
+                {
+                    if (i == index)
+                    {
+                        return static_cast<R>(func(h));
+                    }
+                    if constexpr (sizeof...(t) > 0)
+                    {
+                        return self(self, std::size_t{i + 1}, t...);
+                    }
+                    return R{};
+                };
+                return f_impl(f_impl, std::size_t{0}, args...);
+            },
+            s
+        );
     }
 
     /***************************
diff --git a/test/test_xutils.cpp b/test/test_xutils.cpp
index a6acfe759..5a88baa39 100644
--- a/test/test_xutils.cpp
+++ b/test/test_xutils.cpp
@@ -104,16 +104,16 @@ namespace xt
     TEST(utils, apply)
     {
         ASSERT_TRUE(foo(std::make_tuple(1, 2, 3)) == 2);
-        EXPECT_FALSE(noexcept(foo(std::make_tuple(1, 2, 3))));
+        static_assert(!noexcept(foo(std::make_tuple(1, 2, 3))));
         auto func_ne = [](int i) noexcept
         {
             return i;
         };
         auto t = std::make_tuple(1, 2, 3);
 #if (_MSC_VER >= 1910)
-        EXPECT_FALSE(noexcept(apply<int>(1, func_ne, t)));
+        static_assert(!noexcept(apply<int>(1, func_ne, t)));
 #else
-        EXPECT_TRUE(noexcept(apply<int>(1, func_ne, t)));
+        static_assert(noexcept(apply<int>(1, func_ne, t)));
 #endif
     }