aboutsummaryrefslogtreecommitdiff
path: root/build2/dist
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/dist
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/dist')
-rw-r--r--build2/dist/module20
-rw-r--r--build2/dist/module.cxx20
2 files changed, 20 insertions, 20 deletions
diff --git a/build2/dist/module b/build2/dist/module
index 984a969..3c43c1f 100644
--- a/build2/dist/module
+++ b/build2/dist/module
@@ -14,17 +14,17 @@ namespace build2
{
namespace dist
{
- extern "C" void
- dist_boot (scope&, const location&, unique_ptr<module_base>&);
+ void
+ boot (scope&, const location&, unique_ptr<module_base>&);
- extern "C" bool
- dist_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/dist/module.cxx b/build2/dist/module.cxx
index 58bfc6f..eed9562 100644
--- a/build2/dist/module.cxx
+++ b/build2/dist/module.cxx
@@ -22,8 +22,8 @@ namespace build2
{
static rule rule_;
- extern "C" void
- dist_boot (scope& r, const location&, unique_ptr<module_base>&)
+ void
+ boot (scope& r, const location&, unique_ptr<module_base>&)
{
tracer trace ("dist::boot");
@@ -54,14 +54,14 @@ namespace build2
}
}
- extern "C" bool
- dist_init (scope& r,
- scope&,
- const location& l,
- unique_ptr<module_base>&,
- bool first,
- bool,
- const variable_map& config_hints)
+ bool
+ init (scope& r,
+ scope&,
+ const location& l,
+ unique_ptr<module_base>&,
+ bool first,
+ bool,
+ const variable_map& config_hints)
{
tracer trace ("dist::init");