aboutsummaryrefslogtreecommitdiff
path: root/build2/dist
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-10-17 15:43:47 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-11-04 09:26:25 +0200
commitfc27ec48c9d63879e4b0f049060e943233cb540d (patch)
tree28e062c8674ad194268100bf48475aecaca4c056 /build2/dist
parent8b564b5b8f6d597a9fb76734e759f78c4b1c91da (diff)
Cleanup match_result mess
Diffstat (limited to 'build2/dist')
-rw-r--r--build2/dist/rule4
-rw-r--r--build2/dist/rule.cxx6
2 files changed, 5 insertions, 5 deletions
diff --git a/build2/dist/rule b/build2/dist/rule
index f428ff2..0c40cf0 100644
--- a/build2/dist/rule
+++ b/build2/dist/rule
@@ -20,10 +20,10 @@ namespace build2
{
public:
virtual match_result
- match (action, target&, const string&) const;
+ match (action, target&, const string&) const override;
virtual recipe
- apply (action, target&, const match_result&) const;
+ apply (action, target&) const override;
};
}
}
diff --git a/build2/dist/rule.cxx b/build2/dist/rule.cxx
index e2bad9a..f6b50f7 100644
--- a/build2/dist/rule.cxx
+++ b/build2/dist/rule.cxx
@@ -16,13 +16,13 @@ namespace build2
namespace dist
{
match_result rule::
- match (action, target& t, const string&) const
+ match (action, target&, const string&) const
{
- return t; // We always match.
+ return true; // We always match.
}
recipe rule::
- apply (action a, target& t, const match_result&) const
+ apply (action a, target& t) const
{
const dir_path& out_root (t.root_scope ().out_path ());