From 4e665067ff264c55086fdfb776a95b0fbb4d432c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 12 Feb 2016 16:10:48 +0200
Subject: <types>/<utility> scheme cleanup

---
 build2/install/operation |  3 +++
 build2/install/rule      |  8 +++++---
 build2/install/rule.cxx  |  4 ++--
 build2/install/utility   | 11 +++++------
 4 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'build2/install')

diff --git a/build2/install/operation b/build2/install/operation
index daf7c40..8c93627 100644
--- a/build2/install/operation
+++ b/build2/install/operation
@@ -5,6 +5,9 @@
 #ifndef BUILD2_INSTALL_OPERATION
 #define BUILD2_INSTALL_OPERATION
 
+#include <build2/types>
+#include <build2/utility>
+
 #include <build2/operation>
 
 namespace build2
diff --git a/build2/install/rule b/build2/install/rule
index 7a5f910..9602190 100644
--- a/build2/install/rule
+++ b/build2/install/rule
@@ -5,8 +5,10 @@
 #ifndef BUILD2_INSTALL_RULE
 #define BUILD2_INSTALL_RULE
 
-#include <build2/rule>
 #include <build2/types>
+#include <build2/utility>
+
+#include <build2/rule>
 #include <build2/target>
 #include <build2/operation>
 
@@ -18,7 +20,7 @@ namespace build2
     {
     public:
       virtual match_result
-      match (action, target&, const std::string&) const;
+      match (action, target&, const string&) const;
 
       virtual recipe
       apply (action, target&, const match_result&) const;
@@ -28,7 +30,7 @@ namespace build2
     {
     public:
       virtual match_result
-      match (action, target&, const std::string&) const;
+      match (action, target&, const string&) const;
 
       // Return NULL if this prerequisite should be ignored and pointer to its
       // target otherwise. The default implementation ignores prerequsites that
diff --git a/build2/install/rule.cxx b/build2/install/rule.cxx
index 1b08b16..ae78981 100644
--- a/build2/install/rule.cxx
+++ b/build2/install/rule.cxx
@@ -41,7 +41,7 @@ namespace build2
     // alias_rule
     //
     match_result alias_rule::
-    match (action, target& t, const std::string&) const
+    match (action, target& t, const string&) const
     {
       return t;
     }
@@ -84,7 +84,7 @@ namespace build2
     //
 
     match_result file_rule::
-    match (action a, target& t, const std::string&) const
+    match (action a, target& t, const string&) const
     {
       // First determine if this target should be installed (called
       // "installable" for short).
diff --git a/build2/install/utility b/build2/install/utility
index 98eca77..3d3b1a1 100644
--- a/build2/install/utility
+++ b/build2/install/utility
@@ -5,11 +5,10 @@
 #ifndef BUILD2_INSTALL_UTILITY
 #define BUILD2_INSTALL_UTILITY
 
-#include <string>
-#include <utility>
+#include <build2/types>
+#include <build2/utility>
 
 #include <build2/scope>
-#include <build2/types>
 
 namespace build2
 {
@@ -23,16 +22,16 @@ namespace build2
     {
       auto r (s.target_vars[T::static_type]["*"].assign ("install"));
       if (r.second) // Already set by the user?
-        r.first.get () = std::move (d);
+        r.first.get () = move (d);
     }
 
     template <typename T>
     inline void
-    mode (scope& s, std::string m)
+    mode (scope& s, string m)
     {
       auto r (s.target_vars[T::static_type]["*"].assign ("install.mode"));
       if (r.second) // Already set by the user?
-        r.first.get () = std::move (m);
+        r.first.get () = move (m);
     }
   }
 }
-- 
cgit v1.1