From ccb417a7c1456427b76914e8a11ca87b4926eeb3 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 28 Jan 2020 08:41:57 +0200
Subject: Use scope::var_pool()

---
 libbuild2/config/init.cxx    | 4 ++--
 libbuild2/config/utility.cxx | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'libbuild2/config')

diff --git a/libbuild2/config/init.cxx b/libbuild2/config/init.cxx
index 56aed15..a7f3fc3 100644
--- a/libbuild2/config/init.cxx
+++ b/libbuild2/config/init.cxx
@@ -45,7 +45,7 @@ namespace build2
       // not be valid module names (`build`). We also currently treat `import`
       // as special.
       //
-      auto& vp (rs.ctx.var_pool.rw (rs));
+      auto& vp (rs.var_pool ());
 
       // While config.config.load (see below) could theoretically be specified
       // in a buildfile, config.config.save is expected to always be specified
@@ -166,7 +166,7 @@ namespace build2
 
       assert (config_hints.empty ()); // We don't known any hints.
 
-      auto& vp (rs.ctx.var_pool.rw (rs));
+      auto& vp (rs.var_pool ());
       auto& c_l (vp.insert<paths> ("config.config.load", true /* ovr */));
       auto& c_v (vp.insert<uint64_t> ("config.version", false /*ovr*/));
 
diff --git a/libbuild2/config/utility.cxx b/libbuild2/config/utility.cxx
index 34220f8..fd87c39 100644
--- a/libbuild2/config/utility.cxx
+++ b/libbuild2/config/utility.cxx
@@ -74,7 +74,7 @@ namespace build2
       // any original values, they will be "visible"; see find_override() for
       // details.
       //
-      const variable& vns (rs.ctx.var_pool.rw (rs).insert ("config." + n));
+      const variable& vns (rs.var_pool ().insert ("config." + n));
       for (scope* s (&rs); s != nullptr; s = s->parent_scope ())
       {
         for (auto p (s->vars.find_namespace (vns));
@@ -100,7 +100,7 @@ namespace build2
       // Pattern-typed in boot() as bool.
       //
       const variable& var (
-        rs.ctx.var_pool.rw (rs).insert ("config." + n + ".configured"));
+        rs.var_pool ().insert ("config." + n + ".configured"));
 
       save_variable (rs, var);
 
@@ -114,7 +114,7 @@ namespace build2
       // Pattern-typed in boot() as bool.
       //
       const variable& var (
-        rs.ctx.var_pool.rw (rs).insert ("config." + n + ".configured"));
+        rs.var_pool ().insert ("config." + n + ".configured"));
 
       save_variable (rs, var);
 
-- 
cgit v1.1