From 4f5b6cb7ed4e05e98cce7e692462f49e24b7a39a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 22 Aug 2019 14:38:57 +0200
Subject: Targets, scopes, vars

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

(limited to 'build2/cxx')

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"]));
 
-- 
cgit v1.1