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/bin | |
| parent | 9d0d078ff297138622cd2f3f1076f5984395e42b (diff) | |
New variable architecture
Diffstat (limited to 'build2/bin')
| -rw-r--r-- | build2/bin/module.cxx | 6 | ||||
| -rw-r--r-- | build2/bin/rule.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build2/bin/module.cxx b/build2/bin/module.cxx index 702e762..496b1da 100644 --- a/build2/bin/module.cxx +++ b/build2/bin/module.cxx @@ -156,7 +156,7 @@ namespace build2 // See the cxx module for details on merging. // if (const value& v = config::optional (r, "config.bin.rpath")) - b.assign ("bin.rpath") += as<strings> (v); + b.assign ("bin.rpath") += cast<strings> (v); // config.bin.ar // config.bin.ranlib @@ -170,8 +170,8 @@ namespace build2 auto p (config::required (r, "config.bin.ar", "ar")); auto& v (config::optional (r, "config.bin.ranlib")); - const path& ar (path (as<string> (p.first))); // @@ VAR - const path& ranlib (v ? path (as<string> (v)) : path ()); // @@ VAR + const path& ar (path (cast<string> (p.first))); // @@ VAR + const path& ranlib (v ? path (cast<string> (v)) : path ()); // @@ VAR bin_info bi (guess (ar, ranlib)); diff --git a/build2/bin/rule.cxx b/build2/bin/rule.cxx index 4b1da8f..d74dd65 100644 --- a/build2/bin/rule.cxx +++ b/build2/bin/rule.cxx @@ -46,7 +46,7 @@ namespace build2 // Get the library type to build. If not set for a target, this // should be configured at the project scope by init_lib(). // - const string& type (as<string> (*t["bin.lib"])); + const string& type (cast<string> (*t["bin.lib"])); bool ar (type == "static" || type == "both"); bool so (type == "shared" || type == "both"); @@ -121,7 +121,7 @@ namespace build2 // prerequisite vs prerequisite_target. // // - const string& type (as<string> (*t["bin.lib"])); + const string& type (cast<string> (*t["bin.lib"])); bool ar (type == "static" || type == "both"); bool so (type == "shared" || type == "both"); |