aboutsummaryrefslogtreecommitdiff
path: root/build2/dump.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-01-20 13:46:11 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-02-03 14:35:45 +0200
commit934f2a9a90c5cad3cdc8a66b50c17827a3ddbcee (patch)
treef35f106e5369e98350327c79080c571195234c0b /build2/dump.cxx
parent280f4a5bf787587227ca193cd59c6bd74091db70 (diff)
Get rid of action rule override semantics
Instead we now have two more or less separate match states for outer and inner parts of an action.
Diffstat (limited to 'build2/dump.cxx')
-rw-r--r--build2/dump.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/build2/dump.cxx b/build2/dump.cxx
index f88dcfd..263f1b5 100644
--- a/build2/dump.cxx
+++ b/build2/dump.cxx
@@ -243,12 +243,14 @@ namespace build2
// Note: running serial and task_count is 0 before any operation has
// started.
//
- if (size_t c = t.task_count.load (memory_order_relaxed))
+ action inner; // @@ Only for the inner part of the action currently.
+
+ if (size_t c = t[inner].task_count.load (memory_order_relaxed))
{
if (c == target::count_applied () || c == target::count_executed ())
{
bool f (false);
- for (const target* pt: t.prerequisite_targets)
+ for (const target* pt: t.prerequisite_targets[inner])
{
if (pt == nullptr) // Skipped.
continue;