From 934f2a9a90c5cad3cdc8a66b50c17827a3ddbcee Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 20 Jan 2018 13:46:11 +0200 Subject: 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. --- build2/dist/rule.cxx | 2 +- build2/dist/rule.hxx | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'build2/dist') diff --git a/build2/dist/rule.cxx b/build2/dist/rule.cxx index b288a66..a131000 100644 --- a/build2/dist/rule.cxx +++ b/build2/dist/rule.cxx @@ -15,7 +15,7 @@ namespace build2 { namespace dist { - match_result rule:: + bool rule:: match (action, target&, const string&) const { return true; // We always match. diff --git a/build2/dist/rule.hxx b/build2/dist/rule.hxx index 0524029..ffeed9e 100644 --- a/build2/dist/rule.hxx +++ b/build2/dist/rule.hxx @@ -19,7 +19,6 @@ namespace build2 // This is the default rule that simply matches all the prerequisites. // // A custom rule (usually the same as perform_update) may be necessary to - // enter ad hoc prerequisites (like generated test input/output) or // establishing group links (so that we see the dist variable set on a // group). // @@ -28,7 +27,7 @@ namespace build2 public: rule () {} - virtual match_result + virtual bool match (action, target&, const string&) const override; virtual recipe -- cgit v1.1