From 2d2cbcaf1c2afd1565502f8f0c83fb1cd56f6cec Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 9 Dec 2016 17:56:55 +0200
Subject: Fix GCC 5 compilation error, improve scheduler unit test

---
 build2/scheduler | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'build2')

diff --git a/build2/scheduler b/build2/scheduler
index 99e9524..80b9ec9 100644
--- a/build2/scheduler
+++ b/build2/scheduler
@@ -110,7 +110,7 @@ namespace build2
           new (&td->data) task {
             &task_count,
             decay_copy (forward <F> (f)),
-            {decay_copy (forward <A> (a))...}};
+            typename task::args_type (decay_copy (forward <A> (a))...)};
 
           td->thunk = &task_thunk<F, A...>;
         }
@@ -235,9 +235,12 @@ namespace build2
     template <typename F, typename... A>
     struct task_type
     {
+      using func_type = std::decay_t<F>;
+      using args_type = std::tuple<std::decay_t<A>...>;
+
       atomic_count* task_count;
-      std::decay_t<F> func;
-      std::tuple<std::decay_t<A>...> args;
+      func_type func;
+      args_type args;
 
       template <size_t... i>
       void
-- 
cgit v1.1