From c4fcbad1cb603756dc4dac65392feb86be1a722d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 29 Jan 2020 09:19:06 +0200
Subject: Rename module_base to module, redo module boot/init argument passing

---
 build2/cli/init.cxx | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'build2/cli')

diff --git a/build2/cli/init.cxx b/build2/cli/init.cxx
index 6125f25..18c7ff9 100644
--- a/build2/cli/init.cxx
+++ b/build2/cli/init.cxx
@@ -29,16 +29,13 @@ namespace build2
     config_init (scope& rs,
                  scope& bs,
                  const location& l,
-                 unique_ptr<module_base>&,
                  bool first,
                  bool optional,
-                 const variable_map& hints)
+                 module_init_extra&)
     {
       tracer trace ("cli::config_init");
       l5 ([&]{trace << "for " << bs;});
 
-      assert (hints.empty ()); // We don't known any hints.
-
       // Enter variables.
       //
       if (first)
@@ -300,10 +297,9 @@ namespace build2
     init (scope& rs,
           scope& bs,
           const location& l,
-          unique_ptr<module_base>&,
           bool first,
           bool optional,
-          const variable_map& hints)
+          module_init_extra& extra)
     {
       tracer trace ("cli::init");
       l5 ([&]{trace << "for " << bs;});
@@ -320,7 +316,7 @@ namespace build2
       //
       if (!cast_false<bool> (bs["cli.config.loaded"]))
       {
-        if (!init_module (rs, bs, "cli.config", l, optional, hints))
+        if (!init_module (rs, bs, "cli.config", l, optional, extra.hints))
           return false;
       }
       else if (!cast_false<bool> (bs["cli.config.configured"]))
-- 
cgit v1.1