From 96f2131e593e206f0e458409f22adfff8c1b5356 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 28 Mar 2016 15:59:06 +0200
Subject: Clean up variable usage

---
 build2/cli/module.cxx | 6 +++---
 build2/cli/rule.cxx   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'build2/cli')

diff --git a/build2/cli/module.cxx b/build2/cli/module.cxx
index 4e81908..15c8b90 100644
--- a/build2/cli/module.cxx
+++ b/build2/cli/module.cxx
@@ -57,7 +57,7 @@ namespace build2
 
         v.find<bool> ("config.cli.configured");
 
-        v.find<string> ("config.cli"); //@@ VAR type
+        v.find<path> ("config.cli");
 
         v.find<strings> ("config.cli.options");
         v.find<strings> ("cli.options");
@@ -174,13 +174,13 @@ namespace build2
           }
           else
           {
-            auto p (config::required (root, "config.cli", cli));
+            auto p (config::required (root, "config.cli", path (cli)));
             assert (p.second && cast<string> (p.first) == cli);
           }
         }
         else
         {
-          auto p (config::required (root, "config.cli", cli));
+          auto p (config::required (root, "config.cli", path (cli)));
 
           // If we actually set a new value, test it by trying to execute.
           //
diff --git a/build2/cli/rule.cxx b/build2/cli/rule.cxx
index de14aa1..ece5424 100644
--- a/build2/cli/rule.cxx
+++ b/build2/cli/rule.cxx
@@ -244,9 +244,9 @@ namespace build2
       path rels (relative (s->path ()));
 
       scope& rs (t.root_scope ());
-      const string& cli (cast<string> (rs["config.cli"]));
+      const path& cli (cast<path> (rs["config.cli"]));
 
-      cstrings args {cli.c_str ()};
+      cstrings args {cli.string ().c_str ()};
 
       // See if we need to pass --output-{prefix,suffix}
       //
-- 
cgit v1.1