aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-04-10 17:47:18 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-04-10 17:47:18 +0300
commita8a5e80d6c698f6f0e07ec58067466230b4bf447 (patch)
tree413b241d2b5b7cf02f094197e2f59db3ad89f1a5
parentb1910caafabbe760e4dcda307260c60d7b0c0078 (diff)
Adapt to process_error change
-rw-r--r--build2/cc/compile.cxx4
-rw-r--r--build2/cc/gcc.cxx2
-rw-r--r--build2/cc/link.cxx6
-rw-r--r--build2/cli/init.cxx2
-rw-r--r--build2/cli/rule.cxx2
-rw-r--r--build2/dist/operation.cxx6
-rw-r--r--build2/install/rule.cxx10
-rw-r--r--build2/test/rule.cxx2
-rw-r--r--build2/test/script/runner.cxx4
-rw-r--r--build2/utility.cxx2
10 files changed, 20 insertions, 20 deletions
diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx
index 6493c61..67d254b 100644
--- a/build2/cc/compile.cxx
+++ b/build2/cc/compile.cxx
@@ -1461,7 +1461,7 @@ namespace build2
// it is unwise to try to do any kind of cleanup (like unwinding
// the stack and running destructors).
//
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
@@ -1706,7 +1706,7 @@ namespace build2
// it is unwise to try to do any kind of cleanup (like unwinding
// the stack and running destructors).
//
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
diff --git a/build2/cc/gcc.cxx b/build2/cc/gcc.cxx
index 6ad1ad1..c16191a 100644
--- a/build2/cc/gcc.cxx
+++ b/build2/cc/gcc.cxx
@@ -92,7 +92,7 @@ namespace build2
{
error << "unable to execute " << args[0] << ": " << e;
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
diff --git a/build2/cc/link.cxx b/build2/cc/link.cxx
index 69e8561..bd2face 100644
--- a/build2/cc/link.cxx
+++ b/build2/cc/link.cxx
@@ -1074,7 +1074,7 @@ namespace build2
{
error << "unable to execute " << args[0] << ": " << e;
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
@@ -1597,7 +1597,7 @@ namespace build2
// it is unwise to try to do any kind of cleanup (like unwinding
// the stack and running destructors).
//
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
@@ -1631,7 +1631,7 @@ namespace build2
{
error << "unable to execute " << args[0] << ": " << e;
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
diff --git a/build2/cli/init.cxx b/build2/cli/init.cxx
index 590d434..3e4ba03 100644
--- a/build2/cli/init.cxx
+++ b/build2/cli/init.cxx
@@ -159,7 +159,7 @@ namespace build2
if (!optional)
error << "unable to execute " << args[0] << ": " << e;
- if (e.child ())
+ if (e.child)
exit (1);
// Fall through.
diff --git a/build2/cli/rule.cxx b/build2/cli/rule.cxx
index 96eafbc..7b191ea 100644
--- a/build2/cli/rule.cxx
+++ b/build2/cli/rule.cxx
@@ -293,7 +293,7 @@ namespace build2
{
error << "unable to execute " << args[0] << ": " << e;
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
diff --git a/build2/dist/operation.cxx b/build2/dist/operation.cxx
index accf2d5..033748e 100644
--- a/build2/dist/operation.cxx
+++ b/build2/dist/operation.cxx
@@ -358,7 +358,7 @@ namespace build2
{
error << "unable to execute " << args[0] << ": " << e;
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
@@ -412,7 +412,7 @@ namespace build2
{
error << "unable to execute " << args[0] << ": " << e;
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
@@ -464,7 +464,7 @@ namespace build2
{
error << "unable to execute " << args[0] << ": " << e;
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
diff --git a/build2/install/rule.cxx b/build2/install/rule.cxx
index cf12d36..0cfbe84 100644
--- a/build2/install/rule.cxx
+++ b/build2/install/rule.cxx
@@ -485,7 +485,7 @@ namespace build2
{
error << "unable to execute " << args[0] << ": " << e;
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
@@ -551,7 +551,7 @@ namespace build2
{
error << "unable to execute " << args[0] << ": " << e;
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
@@ -600,7 +600,7 @@ namespace build2
{
error << "unable to execute " << args[0] << ": " << e;
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
@@ -756,7 +756,7 @@ namespace build2
{
error << "unable to execute " << args[0] << ": " << e;
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
@@ -855,7 +855,7 @@ namespace build2
{
error << "unable to execute " << args[0] << ": " << e;
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx
index bc90c1f..da6b2f3 100644
--- a/build2/test/rule.cxx
+++ b/build2/test/rule.cxx
@@ -614,7 +614,7 @@ namespace build2
{
error << "unable to execute " << args[0] << ": " << e;
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
diff --git a/build2/test/script/runner.cxx b/build2/test/script/runner.cxx
index e969d5a..86cc145 100644
--- a/build2/test/script/runner.cxx
+++ b/build2/test/script/runner.cxx
@@ -356,7 +356,7 @@ namespace build2
{
error (ll) << "unable to execute " << pp << ": " << e;
- if (e.child ())
+ if (e.child)
exit (1);
throw failed ();
@@ -1494,7 +1494,7 @@ namespace build2
{
error (ll) << "unable to execute " << args[0] << ": " << e;
- if (e.child ())
+ if (e.child)
std::exit (1);
throw failed ();
diff --git a/build2/utility.cxx b/build2/utility.cxx
index d26265d..475b72f 100644
--- a/build2/utility.cxx
+++ b/build2/utility.cxx
@@ -198,7 +198,7 @@ namespace build2
}
catch (const process_error& e)
{
- if (e.child ())
+ if (e.child)
{
// Note: run_finish() expects this exact message.
//