aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/test/init.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-03-16 08:06:15 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-03-17 07:47:17 +0200
commit9f71deeeb0f8e6fe2c29f209fc96f466fc2831b6 (patch)
tree81e07870c7a16f12c7aca69bf70a71d69251d1fc /libbuild2/test/init.cxx
parent1adbf7b710d52958f6c0168ccb492252c1f19d4a (diff)
Rework config::{omitted,required,optional}() into unified config_lookup()
Diffstat (limited to 'libbuild2/test/init.cxx')
-rw-r--r--libbuild2/test/init.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/libbuild2/test/init.cxx b/libbuild2/test/init.cxx
index c0d0331..a21e8f2 100644
--- a/libbuild2/test/init.cxx
+++ b/libbuild2/test/init.cxx
@@ -140,8 +140,9 @@ namespace build2
auto& m (extra.module_as<module> ());
- // Configure.
+ // Configuration.
//
+ using config::lookup_config;
// Adjust module priority so that the config.test.* values are saved at
// the end of config.build.
@@ -150,7 +151,7 @@ namespace build2
// config.test
//
- if (lookup l = config::omitted (rs, m.config_test).first)
+ if (lookup l = lookup_config (rs, m.config_test))
{
// Figure out which root scope it came from.
//
@@ -166,7 +167,7 @@ namespace build2
// config.test.output
//
- if (lookup l = config::omitted (rs, m.config_test_output).first)
+ if (lookup l = lookup_config (rs, m.config_test_output))
{
const name_pair& p (cast<name_pair> (l));