diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2016-03-28 09:14:31 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-03-28 16:03:35 +0200 |
commit | 3ce44330cca9dbc4314feebb27403ebc3175b6c2 (patch) | |
tree | 8c1f27442f3b2dafaec3ba50baaca3d5fd63dca7 /build2/cli | |
parent | 9d0d078ff297138622cd2f3f1076f5984395e42b (diff) |
New variable architecture
Diffstat (limited to 'build2/cli')
-rw-r--r-- | build2/cli/module.cxx | 10 | ||||
-rw-r--r-- | build2/cli/rule.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/build2/cli/module.cxx b/build2/cli/module.cxx index 6497766..907bd0b 100644 --- a/build2/cli/module.cxx +++ b/build2/cli/module.cxx @@ -45,7 +45,7 @@ namespace build2 { auto l (base["cxx.loaded"]); - if (!l || !as<bool> (*l)) + if (!l || !cast<bool> (*l)) fail (loc) << "cxx module must be loaded before cli"; } @@ -90,7 +90,7 @@ namespace build2 { auto l (root["config.cli.configured"]); - if (l && !as<bool> (*l)) + if (l && !cast<bool> (*l)) return false; } @@ -175,7 +175,7 @@ namespace build2 else { auto p (config::required (root, "config.cli", cli)); - assert (p.second && as<string> (p.first) == cli); + assert (p.second && cast<string> (p.first) == cli); } } else @@ -186,7 +186,7 @@ namespace build2 // if (p.second) { - cli = as<string> (p.first).c_str (); + cli = cast<string> (p.first).c_str (); ver = test (cli); if (ver.empty ()) @@ -209,7 +209,7 @@ namespace build2 // this merging semantics and some of its tricky aspects. // if (const value& v = config::optional (root, "config.cli.options")) - base.assign ("cli.options") += as<strings> (v); + base.assign ("cli.options") += cast<strings> (v); // Register our rules. // diff --git a/build2/cli/rule.cxx b/build2/cli/rule.cxx index bf52993..243c6aa 100644 --- a/build2/cli/rule.cxx +++ b/build2/cli/rule.cxx @@ -244,7 +244,7 @@ namespace build2 path rels (relative (s->path ())); scope& rs (t.root_scope ()); - const string& cli (as<string> (*rs["config.cli"])); + const string& cli (cast<string> (*rs["config.cli"])); cstrings args {cli.c_str ()}; |