From 63f6a8256e3f9fb47cb941be63baa70e2be48d3b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 2 Feb 2017 15:35:44 +0200
Subject: Implement target_set locking, including extension update

---
 build2/algorithm.ixx | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'build2/algorithm.ixx')

diff --git a/build2/algorithm.ixx b/build2/algorithm.ixx
index 365a5c4..f8e3191 100644
--- a/build2/algorithm.ixx
+++ b/build2/algorithm.ixx
@@ -32,12 +32,21 @@ namespace build2
           const dir_path& dir,
           const dir_path& out,
           const string& name,
-          const optional<string>& ext,
+          const string* ext,
           const scope* scope,
           const optional<string>& proj)
   {
     return search (
-      prerequisite_key {proj, {&type, &dir, &out, &name, ext}, scope});
+      prerequisite_key {
+        proj,
+        {
+          &type,
+          &dir,
+          &out,
+          &name,
+          ext != nullptr ? optional<string> (*ext) : nullopt
+        },
+        scope});
   }
 
   template <typename T>
@@ -45,7 +54,7 @@ namespace build2
   search (const dir_path& dir,
           const dir_path& out,
           const string& name,
-          const optional<string>& ext,
+          const string* ext,
           const scope* scope)
   {
     return static_cast<T&> (
-- 
cgit v1.1