From 5035f4ef68922ac758b1e4734e67d73c9228010b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 22 Aug 2019 14:38:57 +0200
Subject: Introduce notion of build context

All non-const global state is now in class context and we can now have
multiple independent builds going on at the same time.
---
 libbuild2/in/init.cxx | 2 +-
 libbuild2/in/rule.cxx | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'libbuild2/in')

diff --git a/libbuild2/in/init.cxx b/libbuild2/in/init.cxx
index a067ec3..8b27336 100644
--- a/libbuild2/in/init.cxx
+++ b/libbuild2/in/init.cxx
@@ -36,7 +36,7 @@ namespace build2
       // Enter variables.
       //
       {
-        auto& vp (var_pool.rw (rs));
+        auto& vp (rs.ctx.var_pool.rw (rs));
 
         // Alternative variable substitution symbol with '$' being the
         // default.
diff --git a/libbuild2/in/rule.cxx b/libbuild2/in/rule.cxx
index 434250e..de7ad88 100644
--- a/libbuild2/in/rule.cxx
+++ b/libbuild2/in/rule.cxx
@@ -435,10 +435,10 @@ namespace build2
           return convert<string> (
             v.type == nullptr
             ? move (v)
-            : functions.call (&t.base_scope (),
-                              "string",
-                              vector_view<value> (&v, 1),
-                              l));
+            : t.ctx.functions.call (&t.base_scope (),
+                                    "string",
+                                    vector_view<value> (&v, 1),
+                                    l));
         }
         catch (const invalid_argument& e)
         {
-- 
cgit v1.1