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 | |
parent | 00ed965e4a29f66666d2bf4372d2d6919c29664e (diff) |
<types>/<utility> scheme cleanup
Diffstat (limited to 'build2/cxx')
-rw-r--r-- | build2/cxx/compile | 4 | ||||
-rw-r--r-- | build2/cxx/compile.cxx | 5 | ||||
-rw-r--r-- | build2/cxx/install | 4 | ||||
-rw-r--r-- | build2/cxx/install.cxx | 2 | ||||
-rw-r--r-- | build2/cxx/link | 12 | ||||
-rw-r--r-- | build2/cxx/link.cxx | 6 | ||||
-rw-r--r-- | build2/cxx/module.cxx | 2 | ||||
-rw-r--r-- | build2/cxx/target | 3 | ||||
-rw-r--r-- | build2/cxx/utility | 6 | ||||
-rw-r--r-- | build2/cxx/utility.txx | 4 |
10 files changed, 21 insertions, 27 deletions
diff --git a/build2/cxx/compile b/build2/cxx/compile index cfef0c4..5134e78 100644 --- a/build2/cxx/compile +++ b/build2/cxx/compile @@ -6,6 +6,8 @@ #define BUILD2_CXX_COMPILE #include <build2/types> +#include <build2/utility> + #include <build2/rule> namespace build2 @@ -16,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; diff --git a/build2/cxx/compile.cxx b/build2/cxx/compile.cxx index b924aa2..a1abfcb 100644 --- a/build2/cxx/compile.cxx +++ b/build2/cxx/compile.cxx @@ -5,17 +5,12 @@ #include <build2/cxx/compile> #include <map> -#include <string> -#include <cstddef> // size_t #include <cstdlib> // exit() -#include <utility> // move() #include <butl/process> -#include <butl/utility> // reverse_iterate #include <butl/fdstream> #include <butl/path-map> -#include <build2/types> #include <build2/scope> #include <build2/variable> #include <build2/algorithm> diff --git a/build2/cxx/install b/build2/cxx/install index cfec3da..119ef94 100644 --- a/build2/cxx/install +++ b/build2/cxx/install @@ -6,6 +6,8 @@ #define BUILD2_CXX_INSTALL #include <build2/types> +#include <build2/utility> + #include <build2/install/rule> namespace build2 @@ -19,7 +21,7 @@ namespace build2 filter (action, target&, prerequisite_member) const; virtual match_result - match (action, target&, const std::string&) const; + match (action, target&, const string&) const; static install instance; }; diff --git a/build2/cxx/install.cxx b/build2/cxx/install.cxx index aa097d7..f6f502a 100644 --- a/build2/cxx/install.cxx +++ b/build2/cxx/install.cxx @@ -49,7 +49,7 @@ namespace build2 } match_result install:: - match (action a, target& t, const std::string& hint) const + match (action a, target& t, const string& hint) const { // @@ How do we split the hint between the two? // 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&); diff --git a/build2/cxx/link.cxx b/build2/cxx/link.cxx index 7e0ff71..42b2235 100644 --- a/build2/cxx/link.cxx +++ b/build2/cxx/link.cxx @@ -4,20 +4,14 @@ #include <build2/cxx/link> -#include <vector> -#include <string> -#include <cstddef> // size_t #include <cstdlib> // exit() -#include <utility> // move() #include <butl/process> -#include <butl/utility> // reverse_iterate #include <butl/fdstream> #include <butl/optional> #include <butl/path-map> #include <butl/filesystem> -#include <build2/types> #include <build2/scope> #include <build2/variable> #include <build2/algorithm> diff --git a/build2/cxx/module.cxx b/build2/cxx/module.cxx index 6f2a891..f615129 100644 --- a/build2/cxx/module.cxx +++ b/build2/cxx/module.cxx @@ -33,7 +33,7 @@ namespace build2 cxx_init (scope& r, scope& b, const location& loc, - std::unique_ptr<module>&, + unique_ptr<module>&, bool first, bool) { diff --git a/build2/cxx/target b/build2/cxx/target index 9d3df4b..d9a4ed6 100644 --- a/build2/cxx/target +++ b/build2/cxx/target @@ -5,6 +5,9 @@ #ifndef BUILD2_CXX_TARGET #define BUILD2_CXX_TARGET +#include <build2/types> +#include <build2/utility> + #include <build2/target> namespace build2 diff --git a/build2/cxx/utility b/build2/cxx/utility index d8b9fc1..7072c7b 100644 --- a/build2/cxx/utility +++ b/build2/cxx/utility @@ -5,9 +5,9 @@ #ifndef BUILD2_CXX_UTILITY #define BUILD2_CXX_UTILITY -#include <string> - #include <build2/types> +#include <build2/utility> + #include <build2/target> #include <build2/config/utility> @@ -22,7 +22,7 @@ namespace build2 // template <typename T> void - append_std (cstrings& args, T&, std::string& storage); + append_std (cstrings& args, T&, string& storage); // Append library options from one of the cxx.export.* variables // recursively, prerequisite libraries first. diff --git a/build2/cxx/utility.txx b/build2/cxx/utility.txx index 2d85b1b..8324107 100644 --- a/build2/cxx/utility.txx +++ b/build2/cxx/utility.txx @@ -10,11 +10,11 @@ namespace build2 { template <typename T> void - append_std (cstrings& args, T& t, std::string& s) + append_std (cstrings& args, T& t, string& s) { if (auto l = t["cxx.std"]) { - const std::string& v (as<string> (*l)); + const string& v (as<string> (*l)); // Translate 11 to 0x and 14 to 1y for compatibility with // older versions of the compiler. |