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/cli | |
| parent | 5607313a91e5ca0113b1f8b9acfd02c1fb105346 (diff) | |
Get rid of extension_pool
Diffstat (limited to 'build2/cli')
| -rw-r--r-- | build2/cli/rule.cxx | 8 | ||||
| -rw-r--r-- | build2/cli/target | 4 | ||||
| -rw-r--r-- | build2/cli/target.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/build2/cli/rule.cxx b/build2/cli/rule.cxx index b97bea2..d457e6d 100644 --- a/build2/cli/rule.cxx +++ b/build2/cli/rule.cxx @@ -88,15 +88,15 @@ namespace build2 // if (t.h == nullptr) { - t.h = &search<cxx::hxx> (t.dir, t.out, t.name, nullptr, nullptr); + t.h = &search<cxx::hxx> (t.dir, t.out, t.name, nullopt, nullptr); t.h->group = &t; - t.c = &search<cxx::cxx> (t.dir, t.out, t.name, nullptr, nullptr); + t.c = &search<cxx::cxx> (t.dir, t.out, t.name, nullopt, nullptr); t.c->group = &t; if (!find_option ("--suppress-inline", t, "cli.options")) { - t.i = &search<cxx::ixx> (t.dir, t.out, t.name, nullptr, nullptr); + t.i = &search<cxx::ixx> (t.dir, t.out, t.name, nullopt, nullptr); t.i->group = &t; } } @@ -211,7 +211,7 @@ namespace build2 const char* option, const char* default_extension) { - assert (t.ext != nullptr); // Should have been figured out in apply(). + assert (t.ext); // Should have been figured out in apply(). if (*t.ext != default_extension) { diff --git a/build2/cli/target b/build2/cli/target index 0160ef3..0cc448d 100644 --- a/build2/cli/target +++ b/build2/cli/target @@ -49,8 +49,8 @@ namespace build2 //using mtime_target::mtime_target; // @@ GCC 4.8 - cli_cxx (dir_path d, dir_path o, string n, const string* e) - : mtime_target (move (d), move (o), move (n), e) + cli_cxx (dir_path d, dir_path o, string n, optional<string> e) + : mtime_target (move (d), move (o), move (n), move (e)) { m[0] = m[1] = m[2] = nullptr; } diff --git a/build2/cli/target.cxx b/build2/cli/target.cxx index 5e12a04..3f09d30 100644 --- a/build2/cli/target.cxx +++ b/build2/cli/target.cxx @@ -53,7 +53,7 @@ namespace build2 dir_path d, dir_path o, string n, - const string* e) + optional<string> e) { tracer trace ("cli::cli_cxx_factory"); @@ -66,7 +66,7 @@ namespace build2 targets.insert<cxx::cxx> (d, o, n, trace); targets.insert<cxx::ixx> (d, o, n, trace); - return new cli_cxx (move (d), move (o), move (n), e); + return new cli_cxx (move (d), move (o), move (n), move (e)); } const target_type cli_cxx::static_type |