From 19af3f6b0873a92582e4787a87a6f14df53ff6ae Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 10 Oct 2022 18:22:31 +0200
Subject: Preparatory work for public/private variable distinction

We still always use the public var_pool from context but where required,
all access now goes through scope::var_pool().
---
 libbuild2/prerequisite.hxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libbuild2/prerequisite.hxx')

diff --git a/libbuild2/prerequisite.hxx b/libbuild2/prerequisite.hxx
index 3b64eae..33efed0 100644
--- a/libbuild2/prerequisite.hxx
+++ b/libbuild2/prerequisite.hxx
@@ -93,7 +93,7 @@ namespace build2
           name (move (n)),
           ext (move (e)),
           scope (s),
-          vars (s.ctx, false /* global */) {}
+          vars (*this, false /* shared */) {}
 
     // Make a prerequisite from a target.
     //
@@ -147,7 +147,7 @@ namespace build2
           ext (move (x.ext)),
           scope (x.scope),
           target (x.target.load (memory_order_relaxed)),
-          vars (move (x.vars)) {}
+          vars (move (x.vars), *this, false /* shared */) {}
 
     prerequisite (const prerequisite& x, memory_order o = memory_order_consume)
         : proj (x.proj),
@@ -158,7 +158,7 @@ namespace build2
           ext (x.ext),
           scope (x.scope),
           target (x.target.load (o)),
-          vars (x.vars) {}
+          vars (x.vars, *this, false /* shared */) {}
   };
 
   inline ostream&
-- 
cgit v1.1