Previous function return arg ignoring fixed

include/async_promise.hpp

@@ -1709,7 +1709,7 @@ class promise
              typename = typename std::enable_if<!std::is_void<FuncResult>::value>::type>
     promise<Result> all(Container<Func, Allocator> funcs) const
     {
-      using task = internal::all_task_void<Result, void, Container, Func, Allocator>;
+      using task = internal::all_task_void<Result, T, Container, Func, Allocator>;
       return promise<Result>{std::make_shared<task>(m_task, std::move(funcs))};
     }
 
@@ -1778,7 +1778,7 @@ class promise
              typename = typename std::true_type::type>
     promise<Result> all_settled(Container<Func, Allocator> funcs) const
     {
-      using task = internal::all_settled_task_void<Result, void, void, Container, Func, Allocator>;
+      using task = internal::all_settled_task_void<Result, T, void, Container, Func, Allocator>;
       return promise<Result>{std::make_shared<task>(m_task, std::move(funcs))};
     }
 
@@ -1814,7 +1814,7 @@ class promise
              typename = typename std::enable_if<!std::is_void<FuncResult>::value>::type>
     promise<Result> all_settled(Container<Func, Allocator> funcs) const
     {
-      using task = internal::all_settled_task_void<Result, void, FuncResult, Container, Func, Allocator>;
+      using task = internal::all_settled_task_void<Result, T, FuncResult, Container, Func, Allocator>;
       return promise<Result>{std::make_shared<task>(m_task, std::move(funcs))};
     }
 
@@ -1845,7 +1845,7 @@ class promise
              typename Result = typename std::result_of<Func()>::type>
     promise<Result> any(Container<Func, Allocator> funcs) const
     {
-      using task = internal::any_task_void<Result, void, Container, Func, Allocator>;
+      using task = internal::any_task_void<Result, T, Container, Func, Allocator>;
       return promise<Result>{std::make_shared<task>(m_task, std::move(funcs))};
     }
 
@@ -1876,7 +1876,7 @@ class promise
              typename Result = typename std::result_of<Func()>::type>
     promise<Result> race(Container<Func, Allocator> funcs) const
     {
-      using task = internal::race_task_void<Result, void, Container, Func, Allocator>;
+      using task = internal::race_task_void<Result, T, Container, Func, Allocator>;
       return promise<Result>{std::make_shared<task>(m_task, std::move(funcs))};
     }
 

tests/CMakeLists.txt

@@ -47,12 +47,12 @@ set(SOURCES
   src/funcs.cpp
   src/initial.cpp
   src/race.cpp
-  src/reject.cpp
-  src/resolve.cpp
   src/static_all_settled.cpp
   src/static_all.cpp
   src/static_any.cpp
   src/static_race.cpp
+  src/static_reject.cpp
+  src/static_resolve.cpp
   src/then.cpp
 )
 

tests/src/all.cpp

@@ -100,6 +100,25 @@ TEST_CASE("All string void", "[all]")
 }
 
 
+TEST_CASE("All string void ignore arg", "[all]")
+{
+  std::vector<std::string(*)()> funcs
+  {
+    [] () { return std::string{str}; },
+    [] () { return std::string{str}; },
+  };
+
+  auto future = async::static_promise<std::string>::resolve(str).all(funcs).run();
+
+  std::vector<std::string> res;
+  REQUIRE_NOTHROW(res = future.get());
+  REQUIRE(res.size() == funcs.size());
+
+  for (const auto& val : res)
+    REQUIRE(val == str);
+}
+
+
 TEST_CASE("All error string void", "[all]")
 {
   std::vector<std::string(*)()> funcs

tests/src/all_settled.cpp

@@ -124,6 +124,27 @@ TEST_CASE("All settled string void", "[all_settled]")
 }
 
 
+TEST_CASE("All settled string void ignore arg", "[all_settled]")
+{
+  std::vector<std::string(*)()> funcs
+  {
+    [] () { return std::string{str}; },
+    [] () { return std::string{str}; },
+  };
+
+  auto future = async::static_promise<std::string>::resolve(str).all_settled(funcs).run();
+
+  std::vector<async::settled<std::string>> res;
+  REQUIRE_NOTHROW(res = future.get());
+
+  REQUIRE(res.size() == funcs.size());
+  REQUIRE(res.front().type == async::settle_type::resolved);
+  REQUIRE(res.front().result == str);
+  REQUIRE(res.back().type == async::settle_type::resolved);
+  REQUIRE(res.back().result == str);
+}
+
+
 TEST_CASE("All settled error string void", "[all_settled]")
 {
   std::vector<std::string(*)()> funcs

tests/src/any.cpp

@@ -126,6 +126,22 @@ TEST_CASE("Any string void", "[any]")
 }
 
 
+TEST_CASE("Any string void ignore arg", "[any]")
+{
+  std::vector<std::string(*)()> funcs
+  {
+    [] () { return std::string{str}; },
+    [] () { return std::string{str}; },
+  };
+
+  auto future = async::static_promise<std::string>::resolve(str).any(funcs).run();
+
+  std::string res;
+  REQUIRE_NOTHROW(res = future.get());
+  REQUIRE(res == str);
+}
+
+
 TEST_CASE("Any error string void", "[any]")
 {
   std::vector<std::string(*)()> funcs

tests/src/race.cpp

@@ -129,6 +129,22 @@ TEST_CASE("Race string void", "[race]")
 }
 
 
+TEST_CASE("Race string void ignore arg", "[race]")
+{
+  std::vector<std::string(*)()> str_void
+  {
+    [] () { return std::string{str}; },
+    [] () { return std::string{str}; },
+  };
+
+  auto future = async::static_promise<std::string>::resolve(str).race(str_void).run();
+
+  std::string res;
+  REQUIRE_NOTHROW(res = future.get());
+  REQUIRE(res == str);
+}
+
+
 TEST_CASE("Race error won string void", "[race]")
 {
   std::vector<std::string(*)()> str_void