From 5164c843513212ab1ac1f721c4de04b6a865eb0c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 19 Jan 2017 16:50:40 +0200
Subject: Get rid of extension_pool

---
 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 78af195..22633bb 100644
--- a/build2/algorithm.cxx
+++ b/build2/algorithm.cxx
@@ -37,8 +37,8 @@ namespace build2
   target&
   search (name n, scope& s)
   {
-    const string* e;
-    const target_type* tt (s.find_target_type (n, e));
+    optional<string> ext;
+    const target_type* tt (s.find_target_type (n, ext));
 
     if (tt == nullptr)
       fail << "unknown target type " << n.type << " in name " << n;
@@ -49,7 +49,7 @@ namespace build2
     // @@ OUT: for now we assume the prerequisite's out is undetermined.
     //         Would need to pass a pair of names.
     //
-    return search (*tt, n.dir, dir_path (), n.value, e, &s, n.proj);
+    return search (*tt, n.dir, dir_path (), n.value, ext, &s, n.proj);
   }
 
   pair<const rule*, match_result>
@@ -333,7 +333,7 @@ namespace build2
 
     // Target is in the out tree, so out directory is empty.
     //
-    fsdir* r (&search<fsdir> (d, dir_path (), string (), nullptr, nullptr));
+    fsdir* r (&search<fsdir> (d, dir_path (), string (), nullopt, nullptr));
     match (a, *r);
     t.prerequisite_targets.emplace_back (r);
     return r;
-- 
cgit v1.1