diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-03-31 10:59:45 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-03-31 10:59:45 +0200 |
| commit | 7253ffee27f6cae34e63a72b2d3d10db10571ecc (patch) | |
| tree | c86b321ad4d2bcb05eda451ad3cae5ac8429cabf /build2/cxx | |
| parent | 6417a4e6af2b7732ec0da6af24f1a56f7cdada3f (diff) | |
Clean up variable lookup interfaces
Diffstat (limited to 'build2/cxx')
| -rw-r--r-- | build2/cxx/compile.cxx | 2 | ||||
| -rw-r--r-- | build2/cxx/link.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build2/cxx/compile.cxx b/build2/cxx/compile.cxx index c4e9cee..914cd10 100644 --- a/build2/cxx/compile.cxx +++ b/build2/cxx/compile.cxx @@ -236,7 +236,7 @@ namespace build2 auto test = [&s, &n, &e, &var] (const target_type& tt) -> const target_type* { - if (auto l = s.lookup (tt, n, var)) + if (auto l = s.find (var, tt, n)) if (cast<string> (l) == e) return &tt; diff --git a/build2/cxx/link.cxx b/build2/cxx/link.cxx index aa60c7e..e4154ab 100644 --- a/build2/cxx/link.cxx +++ b/build2/cxx/link.cxx @@ -780,7 +780,7 @@ namespace build2 if (dd.expect ("cxx.link 1") != nullptr) l4 ([&]{trace << "rule mismatch forcing update of " << t;}); - lookup<const value> ranlib; + lookup ranlib; // Then the linker checksum (ar/ranlib or C++ compiler). // @@ -789,7 +789,7 @@ namespace build2 ranlib = rs["config.bin.ranlib"]; if (ranlib->empty ()) // @@ TMP until proper NULL support. - ranlib = lookup<const value> (); + ranlib = lookup (); const char* rl ( ranlib |