From 934f2a9a90c5cad3cdc8a66b50c17827a3ddbcee Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 20 Jan 2018 13:46:11 +0200
Subject: Get rid of action rule override semantics

Instead we now have two more or less separate match states for outer and
inner parts of an action.
---
 build2/cli/init.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'build2/cli/init.cxx')

diff --git a/build2/cli/init.cxx b/build2/cli/init.cxx
index a4403a9..df123ba 100644
--- a/build2/cli/init.cxx
+++ b/build2/cli/init.cxx
@@ -23,7 +23,7 @@ namespace build2
 {
   namespace cli
   {
-    static const compile compile_;
+    static const compile_rule compile_rule_;
 
     bool
     config_init (scope& rs,
@@ -306,10 +306,10 @@ namespace build2
 
         auto reg = [&r] (meta_operation_id mid, operation_id oid)
         {
-          r.insert<cli_cxx>  (mid, oid, "cli.compile", compile_);
-          r.insert<cxx::hxx> (mid, oid, "cli.compile", compile_);
-          r.insert<cxx::cxx> (mid, oid, "cli.compile", compile_);
-          r.insert<cxx::ixx> (mid, oid, "cli.compile", compile_);
+          r.insert<cli_cxx>  (mid, oid, "cli.compile", compile_rule_);
+          r.insert<cxx::hxx> (mid, oid, "cli.compile", compile_rule_);
+          r.insert<cxx::cxx> (mid, oid, "cli.compile", compile_rule_);
+          r.insert<cxx::ixx> (mid, oid, "cli.compile", compile_rule_);
         };
 
         reg (perform_id, update_id);
-- 
cgit v1.1