Merge remote-tracking branch 'origin/master' into flake

2020-02-03 17:49:01 +01:00
parent e7f2139e25 9da60e3c66
commit bb94677526
4 changed files with 6 additions and 7 deletions
--- a/src/hydra-evaluator/hydra-evaluator.cc
+++ b/src/hydra-evaluator/hydra-evaluator.cc
@ -6,7 +6,7 @@
 #include <algorithm>
 #include <thread>
 #include <cstring>
-#include <experimental/optional>
+#include <optional>

 #include <sys/types.h>
 #include <sys/wait.h>
@ -31,7 +31,7 @@ struct Evaluator

    typedef std::map<JobsetName, Jobset> Jobsets;

-    std::experimental::optional<JobsetName> evalOne;
+    std::optional<JobsetName> evalOne;

    const size_t maxEvals;