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/cc/init.cxx | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'libbuild2/cc/init.cxx')

diff --git a/libbuild2/cc/init.cxx b/libbuild2/cc/init.cxx
index 202c612..723b678 100644
--- a/libbuild2/cc/init.cxx
+++ b/libbuild2/cc/init.cxx
@@ -244,8 +244,9 @@ namespace build2
       //
       load_module (rs, rs, "cc.core.guess", loc);
 
-      // Configure.
+      // Configuration.
       //
+      using config::lookup_config;
 
       // Adjust module priority (compiler).
       //
@@ -261,21 +262,21 @@ namespace build2
       //
       //
       rs.assign ("cc.poptions") += cast_null<strings> (
-        config::optional (rs, "config.cc.poptions"));
+        lookup_config (rs, "config.cc.poptions", nullptr));
 
       rs.assign ("cc.coptions") += cast_null<strings> (
-        config::optional (rs, "config.cc.coptions"));
+        lookup_config (rs, "config.cc.coptions", nullptr));
 
       rs.assign ("cc.loptions") += cast_null<strings> (
-        config::optional (rs, "config.cc.loptions"));
+        lookup_config (rs, "config.cc.loptions", nullptr));
 
       rs.assign ("cc.aoptions") += cast_null<strings> (
-        config::optional (rs, "config.cc.aoptions"));
+        lookup_config (rs, "config.cc.aoptions", nullptr));
 
       rs.assign ("cc.libs") += cast_null<strings> (
-        config::optional (rs, "config.cc.libs"));
+        lookup_config (rs, "config.cc.libs", nullptr));
 
-      if (lookup l = config::omitted (rs, "config.cc.reprocess").first)
+      if (lookup l = lookup_config (rs, "config.cc.reprocess"))
         rs.assign ("cc.reprocess") = *l;
 
       // Load the bin.config module.
-- 
cgit v1.1