diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2017-01-25 15:41:44 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-02-13 12:39:24 +0200 |
commit | 88f0780e34116c0441a8d8c58b8a8fd9fde4b1f5 (patch) | |
tree | 1240b36211772479dc1220712e0daed4e35ecd85 /build2/cxx/init.cxx | |
parent | 61aa8e2b4bd7849838c04dc1f421c4760d88319f (diff) |
Add model mutex, make var_pool const by default
Diffstat (limited to 'build2/cxx/init.cxx')
-rw-r--r-- | build2/cxx/init.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build2/cxx/init.cxx b/build2/cxx/init.cxx index 477056c..f76779b 100644 --- a/build2/cxx/init.cxx +++ b/build2/cxx/init.cxx @@ -175,11 +175,11 @@ namespace build2 // Load cc.core.vars so that we can cache all the cc.* variables. // if (!cast_false<bool> (rs["cc.core.vars.loaded"])) - load_module ("cc.core.vars", rs, rs, loc); + load_module (rs, rs, "cc.core.vars", loc); // Enter all the variables and initialize the module data. // - auto& v (var_pool); + auto& v (var_pool.rw (rs)); cc::config_data d { cc::lang::cxx, @@ -294,7 +294,7 @@ namespace build2 // Load cxx.config. // if (!cast_false<bool> (rs["cxx.config.loaded"])) - load_module ("cxx.config", rs, rs, loc, false, hints); + load_module (rs, rs, "cxx.config", loc, false, hints); config_module& cm (*rs.modules.lookup<config_module> ("cxx.config")); |