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/cli | |
| parent | 00ed965e4a29f66666d2bf4372d2d6919c29664e (diff) | |
<types>/<utility> scheme cleanup
Diffstat (limited to 'build2/cli')
| -rw-r--r-- | build2/cli/module.cxx | 2 | ||||
| -rw-r--r-- | build2/cli/rule | 5 | ||||
| -rw-r--r-- | build2/cli/rule.cxx | 3 | ||||
| -rw-r--r-- | build2/cli/target | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/build2/cli/module.cxx b/build2/cli/module.cxx index 85c8f68..e4f2716 100644 --- a/build2/cli/module.cxx +++ b/build2/cli/module.cxx @@ -32,7 +32,7 @@ namespace build2 cli_init (scope& root, scope& base, const location& loc, - std::unique_ptr<module>&, + unique_ptr<module>&, bool first, bool optional) { diff --git a/build2/cli/rule b/build2/cli/rule index 0b76263..4f8ebc2 100644 --- a/build2/cli/rule +++ b/build2/cli/rule @@ -5,6 +5,9 @@ #ifndef BUILD2_CLI_RULE #define BUILD2_CLI_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; diff --git a/build2/cli/rule.cxx b/build2/cli/rule.cxx index 5cf9390..edd8bc8 100644 --- a/build2/cli/rule.cxx +++ b/build2/cli/rule.cxx @@ -6,7 +6,6 @@ #include <butl/process> -#include <build2/types> #include <build2/scope> #include <build2/target> #include <build2/context> @@ -48,7 +47,7 @@ namespace build2 } match_result compile:: - match (action a, target& xt, const std::string&) const + match (action a, target& xt, const string&) const { tracer trace ("cli::compile::match"); diff --git a/build2/cli/target b/build2/cli/target index 4d8e903..065639b 100644 --- a/build2/cli/target +++ b/build2/cli/target @@ -5,6 +5,9 @@ #ifndef BUILD2_CLI_TARGET #define BUILD2_CLI_TARGET +#include <build2/types> +#include <build2/utility> + #include <build2/target> #include <build2/cxx/target> |