From 88f0780e34116c0441a8d8c58b8a8fd9fde4b1f5 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 25 Jan 2017 15:41:44 +0200 Subject: Add model mutex, make var_pool const by default --- build2/cc/compile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'build2/cc/compile') diff --git a/build2/cc/compile b/build2/cc/compile index 67897f2..11b3919 100644 --- a/build2/cc/compile +++ b/build2/cc/compile @@ -27,10 +27,10 @@ namespace build2 compile (data&&); virtual match_result - match (action, target&, const string& hint) const override; + match (slock&, action, target&, const string& hint) const override; virtual recipe - apply (action, target&) const override; + apply (slock&, action, target&) const override; target_state perform_update (action, target&) const; @@ -40,10 +40,10 @@ namespace build2 private: void - append_lib_options (cstrings&, target&, scope&, lorder) const; + append_lib_options (scope&, cstrings&, target&, lorder) const; void - hash_lib_options (sha256&, target&, scope&, lorder) const; + hash_lib_options (scope&, sha256&, target&, lorder) const; // Mapping of include prefixes (e.g., foo in ) for auto- // generated headers to directories where they will be generated. @@ -61,10 +61,10 @@ namespace build2 append_prefixes (prefix_map&, target&, const variable&) const; void - append_lib_prefixes (prefix_map&, target&, scope&, lorder) const; + append_lib_prefixes (scope&, prefix_map&, target&, lorder) const; prefix_map - build_prefix_map (target&, scope&, lorder) const; + build_prefix_map (scope&, target&, lorder) const; // Reverse-lookup target type from extension. // @@ -74,7 +74,7 @@ namespace build2 // Header dependency injection. // void - inject (action, target&, lorder, file&, depdb&) const; + inject (slock&, action, target&, lorder, file&, depdb&) const; private: const string rule_id; -- cgit v1.1