diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-10-17 15:43:47 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-04 09:26:25 +0200 |
| commit | fc27ec48c9d63879e4b0f049060e943233cb540d (patch) | |
| tree | 28e062c8674ad194268100bf48475aecaca4c056 /build2/algorithm.cxx | |
| parent | 8b564b5b8f6d597a9fb76734e759f78c4b1c91da (diff) | |
Cleanup match_result mess
Diffstat (limited to 'build2/algorithm.cxx')
| -rw-r--r-- | build2/algorithm.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build2/algorithm.cxx b/build2/algorithm.cxx index 2390b04..2a5b2d2 100644 --- a/build2/algorithm.cxx +++ b/build2/algorithm.cxx @@ -55,7 +55,7 @@ namespace build2 pair<const rule*, match_result> match_impl (action a, target& t, bool apply, const rule* skip) { - pair<const rule*, match_result> r; + pair<const rule*, match_result> r (nullptr, false); // By default, clear the resolved targets list before calling // match(). The rule is free to modify this list in match() @@ -143,7 +143,7 @@ namespace build2 if (&ru == skip) continue; - match_result m; + match_result m (false); { auto g ( make_exception_guard ( @@ -212,7 +212,7 @@ namespace build2 // @@ We could also allow the rule to change the recipe // action in apply(). Could be useful with delegates. // - t.recipe (ra, ru.apply (ra, t, m)); + t.recipe (ra, ru.apply (ra, t)); } else { @@ -259,7 +259,7 @@ namespace build2 // phase. // const match_result& mr (rp.second); - g.recipe (mr.recipe_action, rp.first->apply (mr.recipe_action, g, mr)); + g.recipe (mr.recipe_action, rp.first->apply (mr.recipe_action, g)); } // Note that we use execute_direct() rather than execute() here to |