diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-10-17 15:43:47 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-04 09:26:25 +0200 |
| commit | fc27ec48c9d63879e4b0f049060e943233cb540d (patch) | |
| tree | 28e062c8674ad194268100bf48475aecaca4c056 /build2/rule.cxx | |
| parent | 8b564b5b8f6d597a9fb76734e759f78c4b1c91da (diff) | |
Cleanup match_result mess
Diffstat (limited to 'build2/rule.cxx')
| -rw-r--r-- | build2/rule.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/build2/rule.cxx b/build2/rule.cxx index 58340b5..f9805db 100644 --- a/build2/rule.cxx +++ b/build2/rule.cxx @@ -63,18 +63,18 @@ namespace build2 } if (ts != timestamp_unknown && ts != timestamp_nonexistent) - return t; + return true; l4 ([&]{trace << "no existing file for target " << t;}); - return nullptr; + return false; } default: - return t; + return true; } } recipe file_rule:: - apply (action a, target& t, const match_result&) const + apply (action a, target& t) const { // Update triggers the update of this target's prerequisites // so it would seem natural that we should also trigger their @@ -143,13 +143,13 @@ namespace build2 // alias_rule // match_result alias_rule:: - match (action, target& t, const string&) const + match (action, target&, const string&) const { - return t; + return true; } recipe alias_rule:: - apply (action a, target& t, const match_result&) const + apply (action a, target& t) const { // Inject dependency on our directory (note: not parent) so that it is // automatically created on update and removed on clean. @@ -165,13 +165,13 @@ namespace build2 // fsdir_rule // match_result fsdir_rule:: - match (action, target& t, const string&) const + match (action, target&, const string&) const { - return t; + return true; } recipe fsdir_rule:: - apply (action a, target& t, const match_result&) const + apply (action a, target& t) const { // Inject dependency on the parent directory. Note that we don't do it for // clean since we shouldn't (and can't possibly, since it's our parent) be |