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/filesystem.txx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'libbuild2/filesystem.txx')

diff --git a/libbuild2/filesystem.txx b/libbuild2/filesystem.txx
index 057975a..e3cdef3 100644
--- a/libbuild2/filesystem.txx
+++ b/libbuild2/filesystem.txx
@@ -4,14 +4,13 @@
 
 #include <type_traits> // is_base_of
 
-#include <libbuild2/context.hxx> // dry_run
 #include <libbuild2/diagnostics.hxx>
 
 namespace build2
 {
   template <typename T>
   fs_status<butl::rmfile_status>
-  rmfile (const path& f, const T& t, uint16_t v)
+  rmfile (context& ctx, const path& f, const T& t, uint16_t v)
   {
     using namespace butl;
 
@@ -34,7 +33,7 @@ namespace build2
 
     try
     {
-      rs = dry_run
+      rs = ctx.dry_run
         ? file_exists (f) ? rmfile_status::success : rmfile_status::not_exist
         : try_rmfile (f);
     }
@@ -52,7 +51,7 @@ namespace build2
 
   template <typename T>
   fs_status<butl::rmdir_status>
-  rmdir (const dir_path& d, const T& t, uint16_t v)
+  rmdir (context& ctx, const dir_path& d, const T& t, uint16_t v)
   {
     using namespace butl;
 
@@ -75,7 +74,7 @@ namespace build2
     rmdir_status rs;
     try
     {
-      rs = dry_run
+      rs = ctx.dry_run
         ? dir_exists (d) ? rmdir_status::success : rmdir_status::not_exist
         : !(w = work.sub (d)) ? try_rmdir (d) : rmdir_status::not_empty;
     }
-- 
cgit v1.1