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/cxx/link | |
parent | 00ed965e4a29f66666d2bf4372d2d6919c29664e (diff) |
<types>/<utility> scheme cleanup
Diffstat (limited to 'build2/cxx/link')
-rw-r--r-- | build2/cxx/link | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/build2/cxx/link b/build2/cxx/link index b39e16c..cfa6343 100644 --- a/build2/cxx/link +++ b/build2/cxx/link @@ -5,11 +5,9 @@ #ifndef BUILD2_CXX_LINK #define BUILD2_CXX_LINK -#include <vector> - -#include <butl/optional> - #include <build2/types> +#include <build2/utility> + #include <build2/rule> #include <build2/bin/target> @@ -22,7 +20,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; @@ -55,8 +53,8 @@ namespace build2 private: friend class compile; - using search_paths = std::vector<dir_path>; - using search_paths_cache = butl::optional<search_paths>; + using search_paths = vector<dir_path>; + using search_paths_cache = optional<search_paths>; static target* search_library (search_paths_cache&, prerequisite&); |