From 3ce44330cca9dbc4314feebb27403ebc3175b6c2 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 28 Mar 2016 09:14:31 +0200 Subject: New variable architecture --- build2/bin/module.cxx | 6 +++--- build2/bin/rule.cxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'build2/bin') 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 (v); + b.assign ("bin.rpath") += cast (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 (p.first))); // @@ VAR - const path& ranlib (v ? path (as (v)) : path ()); // @@ VAR + const path& ar (path (cast (p.first))); // @@ VAR + const path& ranlib (v ? path (cast (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 (*t["bin.lib"])); + const string& type (cast (*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 (*t["bin.lib"])); + const string& type (cast (*t["bin.lib"])); bool ar (type == "static" || type == "both"); bool so (type == "shared" || type == "both"); -- cgit v1.1