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

---
 libbuild2/install/init.cxx |  7 ++-----
 libbuild2/install/init.hxx | 12 ------------
 2 files changed, 2 insertions(+), 17 deletions(-)

(limited to 'libbuild2/install')

diff --git a/libbuild2/install/init.cxx b/libbuild2/install/init.cxx
index fdcc627..5aa5b1d 100644
--- a/libbuild2/install/init.cxx
+++ b/libbuild2/install/init.cxx
@@ -129,7 +129,7 @@ namespace build2
     functions (function_map&); // functions.cxx
 
     bool
-    boot (scope& rs, const location&, unique_ptr<module_base>&)
+    boot (scope& rs, const location&, module_boot_extra&)
     {
       tracer trace ("install::boot");
       l5 ([&]{trace << "for " << rs;});
@@ -174,10 +174,9 @@ namespace build2
     init (scope& rs,
           scope& bs,
           const location& l,
-          unique_ptr<module_base>&,
           bool first,
           bool,
-          const variable_map& config_hints)
+          module_init_extra&)
     {
       tracer trace ("install::init");
 
@@ -189,8 +188,6 @@ namespace build2
 
       l5 ([&]{trace << "for " << rs;});
 
-      assert (config_hints.empty ()); // We don't known any hints.
-
       // Enter module variables.
       //
       auto& vp (rs.var_pool ());
diff --git a/libbuild2/install/init.hxx b/libbuild2/install/init.hxx
index 353b24b..5506744 100644
--- a/libbuild2/install/init.hxx
+++ b/libbuild2/install/init.hxx
@@ -16,18 +16,6 @@ namespace build2
 {
   namespace install
   {
-    bool
-    boot (scope&, const location&, unique_ptr<module_base>&);
-
-    bool
-    init (scope&,
-          scope&,
-          const location&,
-          unique_ptr<module_base>&,
-          bool,
-          bool,
-          const variable_map&);
-
     // Module `install` requires bootstrapping.
     //
     // `install` -- registers the install, uninstall, and update-for-install
-- 
cgit v1.1