diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2020-01-29 09:19:06 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2020-01-29 09:19:06 +0200 |
commit | c4fcbad1cb603756dc4dac65392feb86be1a722d (patch) | |
tree | da9c9c2278c63d20237a7178fde450d7472a59c9 /build2 | |
parent | ccb417a7c1456427b76914e8a11ca87b4926eeb3 (diff) |
Rename module_base to module, redo module boot/init argument passing
Diffstat (limited to 'build2')
-rw-r--r-- | build2/cli/init.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
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"])) |