Add model mutex, make var_pool const by default

1 files changed, 4 insertions, 4 deletions

diff --git a/build2/file b/build2/file
index c8d8f6f..adfd884 100644
--- a/build2/file
+++ b/build2/file
@@ -56,18 +56,18 @@ namespace build2
   // If buildfile is '-', then read from STDIN.
   //
   void
-  source (const path& buildfile, scope& root, scope& base);
+  source (scope& root, scope& base, const path&);
 
   // As above but first check if this buildfile has already been sourced for
   // the base scope. Return false if the file has already been sourced.
   //
   bool
-  source_once (const path& buildfile, scope& root, scope& base);
+  source_once (scope& root, scope& base, const path&);
 
   // As above but checks against the specified scope rather than base.
   //
   bool
-  source_once (const path& buildfile, scope& root, scope& base, scope& once);
+  source_once (scope& root, scope& base, const path&, scope& once);
 
   // Create project's root scope. Only set the src_root variable if the
   // passed src_root value is not empty.
@@ -143,7 +143,7 @@ namespace build2
   // an indication of whether the variable was found.
   //
   pair<value, bool>
-  extract_variable (const path&, const char* var);
+  extract_variable (const path&, const variable&);
 
   // Import has two phases: the first is triggered by the import
   // directive in the buildfile. It will try to find and load the