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/cxx/compile.cxx | |
parent | 9d0d078ff297138622cd2f3f1076f5984395e42b (diff) |
New variable architecture
Diffstat (limited to 'build2/cxx/compile.cxx')
-rw-r--r-- | build2/cxx/compile.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/build2/cxx/compile.cxx b/build2/cxx/compile.cxx index df2b798..a2b00de 100644 --- a/build2/cxx/compile.cxx +++ b/build2/cxx/compile.cxx @@ -130,7 +130,7 @@ namespace build2 // if (a == perform_update_id) { - const string& sys (as<string> (*rs["cxx.target.system"])); + const string& sys (cast<string> (*rs["cxx.target.system"])); // The cached prerequisite target should be the same as what is in // t.prerequisite_targets since we used standard search() and match() @@ -165,7 +165,7 @@ namespace build2 // Then the compiler checksum. // - if (dd.expect (as<string> (*rs["cxx.checksum"])) != nullptr) + if (dd.expect (cast<string> (*rs["cxx.checksum"])) != nullptr) l4 ([&]{trace << "compiler mismatch forcing update of " << t;}); // Then the options checksum. @@ -237,7 +237,7 @@ namespace build2 -> const target_type* { if (auto l = s.lookup (tt, n, var)) - if (as<string> (*l) == e) + if (cast<string> (*l) == e) return &tt; return nullptr; @@ -283,7 +283,7 @@ namespace build2 if (auto l = t[var]) { - const auto& v (as<strings> (*l)); + const auto& v (cast<strings> (*l)); for (auto i (v.begin ()), e (v.end ()); i != e; ++i) { @@ -461,8 +461,8 @@ namespace build2 auto init_args = [&t, &s, &rs, &args, &cxx_std] () { - const string& cxx (as<string> (*rs["config.cxx"])); - const string& sys (as<string> (*rs["cxx.target.system"])); + const string& cxx (cast<string> (*rs["config.cxx"])); + const string& sys (cast<string> (*rs["cxx.target.system"])); args.push_back (cxx.c_str ()); @@ -923,8 +923,8 @@ namespace build2 path rels (relative (s->path ())); scope& rs (t.root_scope ()); - const string& cxx (as<string> (*rs["config.cxx"])); - const string& sys (as<string> (*rs["cxx.target.system"])); + const string& cxx (cast<string> (*rs["config.cxx"])); + const string& sys (cast<string> (*rs["cxx.target.system"])); cstrings args {cxx.c_str ()}; |