Add a std::tuple constructor in unwrapping to release earlier

eth-cscs · Aug 11, 2023 · 97e3d63 · 97e3d63
1 parent d9d5ac7
commit 97e3d63
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/include/dlaf/common/unwrap.h b/include/dlaf/common/unwrap.h
@@ -12,6 +12,7 @@
 /// @file
 
 #include <functional>
+#include <type_traits>
 
 #include <pika/async_rw_mutex.hpp>
 #include <pika/execution.hpp>
@@ -58,7 +59,18 @@ struct Unwrapping {
   template <typename... Ts>
   auto operator()(Ts&&... ts)
       -> decltype(std::move(f)(Unwrapper<std::decay_t<Ts>>::unwrap(std::forward<Ts>(ts))...)) {
-    return std::move(f)(Unwrapper<std::decay_t<Ts>>::unwrap(std::forward<Ts>(ts))...);
+    using result_type = decltype(std::move(f)(Unwrapper<std::decay_t<Ts>>::unwrap(std::forward<Ts>(ts))...));
+    if constexpr(std::is_void_v<result_type>)
+    {
+        std::move(f)(Unwrapper<std::decay_t<Ts>>::unwrap(std::forward<Ts>(ts))...);
+        std::tuple<Ts...>(std::forward<Ts>(ts)...);
+    }
+    else
+    {
+        auto r = std::move(f)(Unwrapper<std::decay_t<Ts>>::unwrap(std::forward<Ts>(ts))...);
+        std::tuple<Ts...>(std::forward<Ts>(ts)...);
+        return r;
+    }
   }
 };