about summary refs log tree commit diff
path: root/src/libutil/util.hh
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-02-12T12·43+0100
committerEelco Dolstra <edolstra@gmail.com>2019-03-14T13·10+0100
commitef52ccf035fe0bcd78226891022171a28dd6fcbe (patch)
tree25ca43089e573e826fd8341a2a436a93076c26d8 /src/libutil/util.hh
parent86f3b94c8c28defd7402245d60af15ce429986ff (diff)
experimental/optional -> optional
Diffstat (limited to 'src/libutil/util.hh')
-rw-r--r--src/libutil/util.hh6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index bda87bee433e..9f239bff371a 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -14,7 +14,7 @@
 #include <cstdio>
 #include <map>
 #include <sstream>
-#include <experimental/optional>
+#include <optional>
 #include <future>
 
 #ifndef HAVE_STRUCT_DIRENT_D_TYPE
@@ -259,14 +259,14 @@ pid_t startProcess(std::function<void()> fun, const ProcessOptions & options = P
    shell backtick operator). */
 string runProgram(Path program, bool searchPath = false,
     const Strings & args = Strings(),
-    const std::experimental::optional<std::string> & input = {});
+    const std::optional<std::string> & input = {});
 
 struct RunOptions
 {
     Path program;
     bool searchPath = true;
     Strings args;
-    std::experimental::optional<std::string> input;
+    std::optional<std::string> input;
     Source * standardIn = nullptr;
     Sink * standardOut = nullptr;
     bool _killStderr = false;