diff options
Diffstat (limited to 'build2/cxx')
| -rw-r--r-- | build2/cxx/init.cxx | 7 | ||||
| -rw-r--r-- | build2/cxx/target.cxx | 20 |
2 files changed, 14 insertions, 13 deletions
diff --git a/build2/cxx/init.cxx b/build2/cxx/init.cxx index c355763..1ffa098 100644 --- a/build2/cxx/init.cxx +++ b/build2/cxx/init.cxx @@ -62,7 +62,8 @@ namespace build2 // auto enter = [&rs] (const char* v) -> const variable& { - return var_pool.rw (rs).insert<bool> (v, variable_visibility::project); + return rs.ctx.var_pool.rw (rs).insert<bool> ( + v, variable_visibility::project); }; // NOTE: see also module sidebuild subproject if changing anything about @@ -370,7 +371,7 @@ namespace build2 // Enter all the variables and initialize the module data. // - auto& v (var_pool.rw (rs)); + auto& v (rs.ctx.var_pool.rw (rs)); cc::config_data d { cc::lang::cxx, @@ -572,7 +573,7 @@ namespace build2 config_module& cm (*rs.lookup_module<config_module> ("cxx.guess")); - auto& vp (var_pool.rw (rs)); + auto& vp (rs.ctx.var_pool.rw (rs)); bool modules (cast<bool> (rs["cxx.features.modules"])); diff --git a/build2/cxx/target.cxx b/build2/cxx/target.cxx index 025bf9d..45463f3 100644 --- a/build2/cxx/target.cxx +++ b/build2/cxx/target.cxx @@ -19,8 +19,8 @@ namespace build2 &cc::static_type, &target_factory<hxx>, nullptr, /* fixed_extension */ - &target_extension_var<var_extension, hxx_ext_def>, - &target_pattern_var<var_extension, hxx_ext_def>, + &target_extension_var<hxx_ext_def>, + &target_pattern_var<hxx_ext_def>, nullptr, &file_search, false @@ -33,8 +33,8 @@ namespace build2 &cc::static_type, &target_factory<ixx>, nullptr, /* fixed_extension */ - &target_extension_var<var_extension, ixx_ext_def>, - &target_pattern_var<var_extension, ixx_ext_def>, + &target_extension_var<ixx_ext_def>, + &target_pattern_var<ixx_ext_def>, nullptr, &file_search, false @@ -47,8 +47,8 @@ namespace build2 &cc::static_type, &target_factory<txx>, nullptr, /* fixed_extension */ - &target_extension_var<var_extension, txx_ext_def>, - &target_pattern_var<var_extension, txx_ext_def>, + &target_extension_var<txx_ext_def>, + &target_pattern_var<txx_ext_def>, nullptr, &file_search, false @@ -61,8 +61,8 @@ namespace build2 &cc::static_type, &target_factory<cxx>, nullptr, /* fixed_extension */ - &target_extension_var<var_extension, cxx_ext_def>, - &target_pattern_var<var_extension, cxx_ext_def>, + &target_extension_var<cxx_ext_def>, + &target_pattern_var<cxx_ext_def>, nullptr, &file_search, false @@ -75,8 +75,8 @@ namespace build2 &cc::static_type, &target_factory<mxx>, nullptr, /* fixed_extension */ - &target_extension_var<var_extension, mxx_ext_def>, - &target_pattern_var<var_extension, mxx_ext_def>, + &target_extension_var<mxx_ext_def>, + &target_pattern_var<mxx_ext_def>, nullptr, &file_search, false |