diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2015-04-07 10:47:28 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-04-07 10:47:28 +0200 |
| commit | 088a60c512aff26eeb026c516d0afe724880cb2b (patch) | |
| tree | 3fbd798bd6a385875c8db3b2677a94d3abeb23eb /build/diagnostics.cxx | |
| parent | 137df0bea6cebabe5278e67e5dad6f3047c762fb (diff) | |
Provide more convenient access to root scope
Diffstat (limited to 'build/diagnostics.cxx')
| -rw-r--r-- | build/diagnostics.cxx | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/build/diagnostics.cxx b/build/diagnostics.cxx index aab7675..2fad0d3 100644 --- a/build/diagnostics.cxx +++ b/build/diagnostics.cxx @@ -60,16 +60,10 @@ namespace build // diag_do(), etc. // string - diag_do (const action& a, const target& t) + diag_do (const action&, const target& t) { - // @@ root scope - // - scope& root ( - scopes.find ( - scopes.find (t.dir)["out_root"].as<const path&> ())); - - const meta_operation_info& mi (root.meta_operations[a.meta_operation ()]); - const operation_info& oi (root.operations[a.operation ()]); + const meta_operation_info& mi (*current_mif); + const operation_info& oi (*current_oif); ostringstream os; @@ -91,16 +85,10 @@ namespace build } string - diag_doing (const action& a, const target& t) + diag_doing (const action&, const target& t) { - // @@ root scope - // - scope& root ( - scopes.find ( - scopes.find (t.dir)["out_root"].as<const path&> ())); - - const meta_operation_info& mi (root.meta_operations[a.meta_operation ()]); - const operation_info& oi (root.operations[a.operation ()]); + const meta_operation_info& mi (*current_mif); + const operation_info& oi (*current_oif); ostringstream os; @@ -118,16 +106,10 @@ namespace build } string - diag_already_done (const action& a, const target& t) + diag_already_done (const action&, const target& t) { - // @@ root scope - // - scope& root ( - scopes.find ( - scopes.find (t.dir)["out_root"].as<const path&> ())); - - const meta_operation_info& mi (root.meta_operations[a.meta_operation ()]); - const operation_info& oi (root.operations[a.operation ()]); + const meta_operation_info& mi (*current_mif); + const operation_info& oi (*current_oif); ostringstream os; |