From d018b131e1558c98f59fdb68da2b62602a320280 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 13 May 2021 14:41:26 +0200 Subject: Rearrange inline function definitions to make MinGW GCC happy --- libbuild2/scheduler.hxx | 7 +++---- libbuild2/scheduler.ixx | 6 ++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libbuild2/scheduler.hxx b/libbuild2/scheduler.hxx index da3f0c0..dcde79b 100644 --- a/libbuild2/scheduler.hxx +++ b/libbuild2/scheduler.hxx @@ -119,11 +119,10 @@ namespace build2 const atomic_count& task_count, work_queue = work_all); + // As above but assume 0 start_count. + // size_t - wait (const atomic_count& task_count, work_queue wq = work_all) - { - return wait (0, task_count, wq); - } + wait (const atomic_count& task_count, work_queue wq = work_all); // As above but call lock.unlock() before suspending (can be used to // unlock the phase). diff --git a/libbuild2/scheduler.ixx b/libbuild2/scheduler.ixx index 4cf347c..96eaee1 100644 --- a/libbuild2/scheduler.ixx +++ b/libbuild2/scheduler.ixx @@ -18,6 +18,12 @@ namespace build2 return suspend (start_count, task_count); } + inline size_t scheduler:: + wait (const atomic_count& task_count, work_queue wq) + { + return wait (0, task_count, wq); + } + template inline size_t scheduler:: wait (size_t start_count, -- cgit v1.1