diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2022-04-07 09:33:50 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2022-04-07 09:33:50 +0200 |
| commit | bee90675a701d7267caba40921b4606db5072247 (patch) | |
| tree | 14c40930f9e19fde4a8e93e4ea8f2d68280a50a6 /libbuild2/cc | |
| parent | 4576f80a09ca247ee89e99a8103cc0c87e20672e (diff) | |
Rename {match,execute}() to *_sync(), add *_complete()
In particular, the match() rename makes sure it doesn't clash with
rule::match() which, after removal of the hint argument in simple_rule,
has exactly the same signature, thus making it error-prone to calling
recursively.
Diffstat (limited to 'libbuild2/cc')
| -rw-r--r-- | libbuild2/cc/compile-rule.cxx | 2 | ||||
| -rw-r--r-- | libbuild2/cc/link-rule.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libbuild2/cc/compile-rule.cxx b/libbuild2/cc/compile-rule.cxx index 24c9b2b..a5e5417 100644 --- a/libbuild2/cc/compile-rule.cxx +++ b/libbuild2/cc/compile-rule.cxx @@ -1013,7 +1013,7 @@ namespace build2 // unmatch. See how we do this in ad hoc rule. // pair<bool, target_state> mr ( - build2::match ( + match_complete ( a, *pt, pt->is_a<liba> () || pt->is_a<libs> () || pt->is_a<libux> () diff --git a/libbuild2/cc/link-rule.cxx b/libbuild2/cc/link-rule.cxx index 30024ce..ffb7dfb 100644 --- a/libbuild2/cc/link-rule.cxx +++ b/libbuild2/cc/link-rule.cxx @@ -1844,7 +1844,7 @@ namespace build2 if (pt == nullptr || (m = unmark (pt)) == 0) continue; - build2::match (a, *pt); + match_complete (a, *pt); // Nothing else to do if not marked for verification. // |