diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-01-19 16:50:40 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-01-19 16:50:40 +0200 |
| commit | 5164c843513212ab1ac1f721c4de04b6a865eb0c (patch) | |
| tree | 1c6b2f440bd6dcd41fed60e76095bae2bf4e9e54 /build2/algorithm.cxx | |
| parent | 5607313a91e5ca0113b1f8b9acfd02c1fb105346 (diff) | |
Get rid of extension_pool
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 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; |