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/cli/module | 16 ++++++++-------- build2/cli/module.cxx | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'build2/cli') diff --git a/build2/cli/module b/build2/cli/module index f55e03c..50d07ef 100644 --- a/build2/cli/module +++ b/build2/cli/module @@ -14,14 +14,14 @@ namespace build2 { namespace cli { - extern "C" bool - cli_init (scope&, - scope&, - const location&, - unique_ptr&, - bool, - bool, - const variable_map&); + bool + init (scope&, + scope&, + const location&, + unique_ptr&, + bool, + bool, + const variable_map&); } } diff --git a/build2/cli/module.cxx b/build2/cli/module.cxx index 13325d9..01d606f 100644 --- a/build2/cli/module.cxx +++ b/build2/cli/module.cxx @@ -25,14 +25,14 @@ namespace build2 { static compile compile_; - extern "C" bool - cli_init (scope& root, - scope& base, - const location& loc, - unique_ptr&, - bool first, - bool optional, - const variable_map& config_hints) + bool + init (scope& root, + scope& base, + const location& loc, + unique_ptr&, + bool first, + bool optional, + const variable_map& config_hints) { tracer trace ("cli::init"); l5 ([&]{trace << "for " << base.out_path ();}); -- cgit v1.1