aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-08-21 12:38:35 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-08-21 12:38:35 +0200
commit3b6f882ce0dae1d80a330b36a63fbe65026a3278 (patch)
treef44ad1a4c688ad224f728dd433a828aa7aea7482
parentbdabddcc90a5cc203a2821c8229e7238c32f5ba6 (diff)
Adjust to new butl::process interface
-rw-r--r--build2/utility6
-rw-r--r--build2/utility.cxx4
-rw-r--r--build2/utility.txx2
3 files changed, 6 insertions, 6 deletions
diff --git a/build2/utility b/build2/utility
index a636c01..ee12545 100644
--- a/build2/utility
+++ b/build2/utility
@@ -85,10 +85,10 @@ namespace build2
// in case of an error.
//
process
- start_run (const char* const* args, bool error);
+ start_run (const char* args[], bool error);
bool
- finish_run (const char* const* args, bool error, process&, const string&);
+ finish_run (const char* args[], bool error, process&, const string&);
// Start the process as above and then call the specified function on each
// trimmed line of the output until it returns a non-empty object T (tested
@@ -106,7 +106,7 @@ namespace build2
//
template <typename T>
T
- run (const char* const* args,
+ run (const char* args[],
T (*) (string&),
bool error = true,
bool ignore_exit = false,
diff --git a/build2/utility.cxx b/build2/utility.cxx
index 3eda7e1..8ebfe06 100644
--- a/build2/utility.cxx
+++ b/build2/utility.cxx
@@ -70,7 +70,7 @@ namespace build2
}
process
- start_run (const char* const* args, bool err)
+ start_run (const char* args[], bool err)
{
if (verb >= 3)
print_process (args);
@@ -96,7 +96,7 @@ namespace build2
};
bool
- finish_run (const char* const* args, bool err, process& pr, const string& l)
+ finish_run (const char* args[], bool err, process& pr, const string& l)
try
{
if (pr.wait ())
diff --git a/build2/utility.txx b/build2/utility.txx
index a00f3fb..3e29db6 100644
--- a/build2/utility.txx
+++ b/build2/utility.txx
@@ -6,7 +6,7 @@ namespace build2
{
template <typename T>
T
- run (const char* const* args,
+ run (const char* args[],
T (*f) (string&),
bool err,
bool ignore_exit,