aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2018-08-20 17:58:23 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2018-08-20 17:58:23 +0300
commit40b06694f1f2aa6cdcf71fdd3f3d717154ee1c06 (patch)
tree297cd41a8303f7e9dc62c03acd1afccfb4c0f6fa
parent8b0656dbb567c59d556762d554a2c7a4805afa89 (diff)
Adapt to new process::try_wait() function signature
-rw-r--r--msvc-common/msvc-filter.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/msvc-common/msvc-filter.cxx b/msvc-common/msvc-filter.cxx
index ae1a3ff..b45a90b 100644
--- a/msvc-common/msvc-filter.cxx
+++ b/msvc-common/msvc-filter.cxx
@@ -18,6 +18,7 @@
#include <libbutl/path.mxx> // path::traits::realize()
#include <libbutl/utility.mxx> // alpha(), throw_generic_error()
#include <libbutl/process.mxx>
+#include <libbutl/optional.mxx>
#include <libbutl/fdstream.mxx>
#include <msvc-common/version.hxx>
@@ -297,10 +298,10 @@ try
// Timeout occured. Apply wineserver bug workaround if required.
//
- bool status;
- if (r == 0 && pr.try_wait (status))
+ butl::optional<bool> status;
+ if (r == 0 && (status = pr.try_wait ()))
{
- if (!status)
+ if (!*status)
// Handle the child failure outside the loop.
//
break;