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/parser.cxx | |
| parent | 5607313a91e5ca0113b1f8b9acfd02c1fb105346 (diff) | |
Get rid of extension_pool
Diffstat (limited to 'build2/parser.cxx')
| -rw-r--r-- | build2/parser.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/build2/parser.cxx b/build2/parser.cxx index 6025082..9ce916e 100644 --- a/build2/parser.cxx +++ b/build2/parser.cxx @@ -91,7 +91,7 @@ namespace build2 tracer& tr) : p_ (&p), t_ (p.target_) { - const string* e; + optional<string> e; const target_type* ti (p.scope_->find_target_type (n, e)); if (ti == nullptr) @@ -131,7 +131,7 @@ namespace build2 // Find or insert. // p.target_ = &targets.insert ( - *ti, move (d), move (out), move (n.value), e, tr).first; + *ti, move (d), move (out), move (n.value), move (e), tr).first; } ~enter_target () @@ -642,7 +642,7 @@ namespace build2 for (auto& pn: pns) { - const string* e; + optional<string> e; const target_type* ti (scope_->find_target_type (pn, e)); if (ti == nullptr) @@ -672,7 +672,7 @@ namespace build2 move (pn.dir), dir_path (), move (pn.value), - e, + move (e), *scope_, trace).first); @@ -3560,7 +3560,7 @@ namespace build2 scope_->out_path (), dir_path (), // Out tree target. "", - nullptr, + nullopt, trace) != targets.end ()) return; @@ -3573,7 +3573,7 @@ namespace build2 scope_->out_path (), dir_path (), "", - nullptr, + nullopt, trace).first); prerequisite& p ( @@ -3608,7 +3608,7 @@ namespace build2 move (d), move (out), p.leaf ().base ().string (), - &extension_pool.find (p.extension ()), // Always specified. + p.extension (), // Always specified. trace); } |