aboutsummaryrefslogtreecommitdiff
path: root/build2/install
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/install
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/install')
-rw-r--r--build2/install/module20
-rw-r--r--build2/install/module.cxx20
2 files changed, 20 insertions, 20 deletions
diff --git a/build2/install/module b/build2/install/module
index b2a3301..3f59fee 100644
--- a/build2/install/module
+++ b/build2/install/module
@@ -14,17 +14,17 @@ namespace build2
{
namespace install
{
- extern "C" void
- install_boot (scope&, const location&, unique_ptr<module_base>&);
+ void
+ boot (scope&, const location&, unique_ptr<module_base>&);
- extern "C" bool
- install_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/install/module.cxx b/build2/install/module.cxx
index 6a7e500..5a18899 100644
--- a/build2/install/module.cxx
+++ b/build2/install/module.cxx
@@ -100,8 +100,8 @@ namespace build2
static alias_rule alias_;
static file_rule file_;
- extern "C" void
- install_boot (scope& r, const location&, unique_ptr<module_base>&)
+ void
+ boot (scope& r, const location&, unique_ptr<module_base>&)
{
tracer trace ("install::boot");
@@ -112,14 +112,14 @@ namespace build2
r.operations.insert (install_id, install);
}
- extern "C" bool
- install_init (scope& r,
- scope& b,
- const location& l,
- unique_ptr<module_base>&,
- bool first,
- bool,
- const variable_map& config_hints)
+ bool
+ init (scope& r,
+ scope& b,
+ const location& l,
+ unique_ptr<module_base>&,
+ bool first,
+ bool,
+ const variable_map& config_hints)
{
tracer trace ("install::init");