From 9f71deeeb0f8e6fe2c29f209fc96f466fc2831b6 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 16 Mar 2020 08:06:15 +0200
Subject: Rework config::{omitted,required,optional}() into unified
 config_lookup()

---
 libbuild2/test/init.cxx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'libbuild2/test')

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));
 
-- 
cgit v1.1