From 9034f7c51ef6437ce9d4547ba5bde217b4740fb2 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 19 Apr 2022 11:10:53 +0200 Subject: Use target recipe for auxiliary data storage during match-apply In particular, we now have separate auxiliary data storage for inner and outer operations. --- libbuild2/adhoc-rule-regex-pattern.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libbuild2/adhoc-rule-regex-pattern.cxx') diff --git a/libbuild2/adhoc-rule-regex-pattern.cxx b/libbuild2/adhoc-rule-regex-pattern.cxx index 3bd3bb1..98acfb6 100644 --- a/libbuild2/adhoc-rule-regex-pattern.cxx +++ b/libbuild2/adhoc-rule-regex-pattern.cxx @@ -272,7 +272,7 @@ namespace build2 return false; } - t.data (move (mr)); + t.data (a, move (mr)); return true; } @@ -297,9 +297,9 @@ namespace build2 } void adhoc_rule_regex_pattern:: - apply_adhoc_members (action, target& t, const scope&, match_extra&) const + apply_adhoc_members (action a, target& t, const scope&, match_extra&) const { - const auto& mr (t.data ()); + const auto& mr (t.data (a)); for (auto i (targets_.begin () + 1); i != targets_.end (); ++i) { @@ -342,7 +342,7 @@ namespace build2 const scope& bs, match_extra&) const { - const auto& mr (t.data ()); + const auto& mr (t.data (a)); // Re-create the same clean semantics as in match_prerequisite_members(). // -- cgit v1.1