From 34cc74df52ed129bffeb7b6fcf11f05c222550ba Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 27 Jun 2016 15:27:14 +0200 Subject: Get rid of extern "C" in module boot()/init() We will have a separate (extern "C") register() function that will return the pointers to these two. This way we can still throw exceptions from boot() and init(). --- build2/b.cxx | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'build2/b.cxx') diff --git a/build2/b.cxx b/build2/b.cxx index 633d583..e7c8721 100644 --- a/build2/b.cxx +++ b/build2/b.cxx @@ -185,18 +185,16 @@ main (int argc, char* argv[]) // Register builtin modules. // - builtin_modules["config"] = module_functions {&config::config_boot, - &config::config_init}; - builtin_modules["dist"] = module_functions {&dist::dist_boot, - &dist::dist_init}; - builtin_modules["test"] = module_functions {&test::test_boot, - &test::test_init}; - builtin_modules["install"] = module_functions {&install::install_boot, - &install::install_init}; - - builtin_modules["bin"] = module_functions {nullptr, &bin::bin_init}; - builtin_modules["cxx"] = module_functions {nullptr, &cxx::cxx_init}; - builtin_modules["cli"] = module_functions {nullptr, &cli::cli_init}; + builtin_modules["config"] = module_functions {&config::boot, + &config::init}; + builtin_modules["dist"] = module_functions {&dist::boot, &dist::init}; + builtin_modules["test"] = module_functions {&test::boot, &test::init}; + builtin_modules["install"] = module_functions {&install::boot, + &install::init}; + + builtin_modules["bin"] = module_functions {nullptr, &bin::init}; + builtin_modules["cxx"] = module_functions {nullptr, &cxx::init}; + builtin_modules["cli"] = module_functions {nullptr, &cli::init}; // Figure out work and home directories. // -- cgit v1.1