From bee90675a701d7267caba40921b4606db5072247 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 7 Apr 2022 09:33:50 +0200 Subject: 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. --- libbuild2/install/rule.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libbuild2/install') diff --git a/libbuild2/install/rule.cxx b/libbuild2/install/rule.cxx index 0a1b994..30f1755 100644 --- a/libbuild2/install/rule.cxx +++ b/libbuild2/install/rule.cxx @@ -149,8 +149,8 @@ namespace build2 // libu{}) then ignore it if there is no rule to install. // if (pt->is_a ()) - build2::match (a, *pt); - else if (!try_match (a, *pt).first) + match_sync (a, *pt); + else if (!try_match_sync (a, *pt).first) { l5 ([&]{trace << "ignoring " << *pt << " (no rule)";}); pt = nullptr; @@ -284,7 +284,7 @@ namespace build2 continue; } - build2::match (a, *mt); + match_sync (a, *mt); pts.push_back (mt); // Never ad hoc. } } @@ -434,10 +434,10 @@ namespace build2 // when updating static installable content (headers, documentation, // etc). // - if (build2::match (a, *pt, unmatch::unchanged).first) + if (match_sync (a, *pt, unmatch::unchanged).first) pt = nullptr; } - else if (!try_match (a, *pt).first) + else if (!try_match_sync (a, *pt).first) { l5 ([&]{trace << "ignoring " << *pt << " (no rule)";}); pt = nullptr; -- cgit v1.1