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/bin/module.cxx | 2 +-
 build2/bin/rule       | 7 +++++--
 build2/bin/rule.cxx   | 4 ++--
 build2/bin/target     | 3 +++
 4 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'build2/bin')

diff --git a/build2/bin/module.cxx b/build2/bin/module.cxx
index 472ee86..397ab74 100644
--- a/build2/bin/module.cxx
+++ b/build2/bin/module.cxx
@@ -33,7 +33,7 @@ namespace build2
     bin_init (scope& r,
               scope& b,
               const location&,
-              std::unique_ptr<module>&,
+              unique_ptr<module>&,
               bool first,
               bool)
     {
diff --git a/build2/bin/rule b/build2/bin/rule
index 100697c..9bf1379 100644
--- a/build2/bin/rule
+++ b/build2/bin/rule
@@ -5,6 +5,9 @@
 #ifndef BUILD2_BIN_RULE
 #define BUILD2_BIN_RULE
 
+#include <build2/types>
+#include <build2/utility>
+
 #include <build2/rule>
 
 namespace build2
@@ -15,7 +18,7 @@ namespace build2
     {
     public:
       virtual match_result
-      match (action, target&, const std::string& hint) const;
+      match (action, target&, const string& hint) const;
 
       virtual recipe
       apply (action, target&, const match_result&) const;
@@ -25,7 +28,7 @@ namespace build2
     {
     public:
       virtual match_result
-      match (action, target&, const std::string& hint) const;
+      match (action, target&, const string& hint) const;
 
       virtual recipe
       apply (action, target&, const match_result&) const;
diff --git a/build2/bin/rule.cxx b/build2/bin/rule.cxx
index 9b1b8c4..4b1da8f 100644
--- a/build2/bin/rule.cxx
+++ b/build2/bin/rule.cxx
@@ -20,7 +20,7 @@ namespace build2
     // obj
     //
     match_result obj_rule::
-    match (action a, target& t, const std::string&) const
+    match (action a, target& t, const string&) const
     {
       fail << diag_doing (a, t) << " target group" <<
         info << "explicitly select either obja{} or objso{} member";
@@ -37,7 +37,7 @@ namespace build2
     // members as our prerequisites.
     //
     match_result lib_rule::
-    match (action a, target& xt, const std::string&) const
+    match (action a, target& xt, const string&) const
     {
       lib& t (static_cast<lib&> (xt));
 
diff --git a/build2/bin/target b/build2/bin/target
index 0816c66..f386592 100644
--- a/build2/bin/target
+++ b/build2/bin/target
@@ -5,6 +5,9 @@
 #ifndef BUILD2_BIN_TARGET
 #define BUILD2_BIN_TARGET
 
+#include <build2/types>
+#include <build2/utility>
+
 #include <build2/target>
 
 namespace build2
-- 
cgit v1.1