From d263455d5ac0d87541144dd7a37eb6255b721a89 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 2 Feb 2017 11:55:03 +0200
Subject: Redesign target_set interface in preparation for locking

---
 build2/search.cxx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'build2/search.cxx')

diff --git a/build2/search.cxx b/build2/search.cxx
index 65eb2fd..8f621c2 100644
--- a/build2/search.cxx
+++ b/build2/search.cxx
@@ -71,15 +71,13 @@ namespace build2
         o.clear ();
     }
 
-    auto i (targets.find (*tk.type, d, o, *tk.name, tk.ext, trace));
+    target* t (targets.find (*tk.type, d, o, *tk.name, tk.ext, trace));
 
-    if (i == targets.end ())
-      return 0;
+    if (t != nullptr)
+      l5 ([&]{trace << "existing target " << t
+                    << " for prerequisite " << pk;});
 
-    target& t (**i);
-
-    l5 ([&]{trace << "existing target " << t << " for prerequisite " << pk;});
-    return &t;
+    return t;
   }
 
   target*
-- 
cgit v1.1