diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-02-12 16:10:48 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-02-12 16:10:48 +0200 |
| commit | 4e665067ff264c55086fdfb776a95b0fbb4d432c (patch) | |
| tree | 2371403561c0a3d754792f68d2515cae71dff565 /build2/algorithm.ixx | |
| parent | 00ed965e4a29f66666d2bf4372d2d6919c29664e (diff) | |
<types>/<utility> scheme cleanup
Diffstat (limited to 'build2/algorithm.ixx')
| -rw-r--r-- | build2/algorithm.ixx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/build2/algorithm.ixx b/build2/algorithm.ixx index cdb76b5..19eb7e7 100644 --- a/build2/algorithm.ixx +++ b/build2/algorithm.ixx @@ -2,8 +2,6 @@ // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <utility> // pair - #include <build2/rule> #include <build2/prerequisite> #include <build2/context> @@ -30,8 +28,8 @@ namespace build2 inline target& search (const target_type& type, const dir_path& dir, - const std::string& name, - const std::string* ext, + const string& name, + const string* ext, scope* scope) { return search ( @@ -41,14 +39,14 @@ namespace build2 template <typename T> inline T& search (const dir_path& dir, - const std::string& name, - const std::string* ext, + const string& name, + const string* ext, scope* scope) { return static_cast<T&> (search (T::static_type, dir, name, ext, scope)); } - std::pair<const rule*, match_result> + pair<const rule*, match_result> match_impl (action, target&, bool apply); inline void @@ -80,13 +78,13 @@ namespace build2 match_impl (a, t, false); } - inline std::pair<recipe, action> + inline pair<recipe, action> match_delegate (action a, target& t) { auto rp (match_impl (a, t, false)); const match_result& mr (rp.second); - return std::make_pair (rp.first->apply (mr.recipe_action, t, mr), - mr.recipe_action); + return make_pair (rp.first->apply (mr.recipe_action, t, mr), + mr.recipe_action); } group_view |