From 88f0780e34116c0441a8d8c58b8a8fd9fde4b1f5 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 25 Jan 2017 15:41:44 +0200
Subject: Add model mutex, make var_pool const by default

---
 build2/cli/init.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'build2/cli/init.cxx')

diff --git a/build2/cli/init.cxx b/build2/cli/init.cxx
index b34711d..2650c1b 100644
--- a/build2/cli/init.cxx
+++ b/build2/cli/init.cxx
@@ -43,7 +43,7 @@ namespace build2
       //
       if (first)
       {
-        auto& v (var_pool);
+        auto& v (var_pool.rw (rs));
 
         // Note: some overridable, some not.
         //
@@ -274,7 +274,7 @@ namespace build2
       //
       if (!cast_false<bool> (bs["cli.config.loaded"]))
       {
-        if (!load_module ("cli.config", rs, bs, l, optional, hints))
+        if (!load_module (rs, bs, "cli.config", l, optional, hints))
           return false;
       }
       else if (!cast_false<bool> (bs["cli.config.configured"]))
-- 
cgit v1.1