From fc27ec48c9d63879e4b0f049060e943233cb540d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 17 Oct 2016 15:43:47 +0200
Subject: Cleanup match_result mess

---
 build2/algorithm.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'build2/algorithm.cxx')

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
-- 
cgit v1.1