aboutsummaryrefslogtreecommitdiff
path: root/build2/cli
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-06-27 15:27:14 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-06-27 15:27:14 +0200
commit34cc74df52ed129bffeb7b6fcf11f05c222550ba (patch)
treec4e3a48a03cf507ee4a4219a8b3d57c4dce17a8c /build2/cli
parent5f924ea1926fe17acf699a43713b7f5881e9d30d (diff)
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().
Diffstat (limited to 'build2/cli')
-rw-r--r--build2/cli/module16
-rw-r--r--build2/cli/module.cxx16
2 files changed, 16 insertions, 16 deletions
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<module_base>&,
- bool,
- bool,
- const variable_map&);
+ bool
+ init (scope&,
+ scope&,
+ const location&,
+ unique_ptr<module_base>&,
+ 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<module_base>&,
- bool first,
- bool optional,
- const variable_map& config_hints)
+ bool
+ init (scope& root,
+ scope& base,
+ const location& loc,
+ unique_ptr<module_base>&,
+ bool first,
+ bool optional,
+ const variable_map& config_hints)
{
tracer trace ("cli::init");
l5 ([&]{trace << "for " << base.out_path ();});