1 files changed, 9 insertions, 0 deletions
diff --git a/src/optional.h b/src/optional.h
index 1614c89718..95a3b24d0a 100644
--- a/src/optional.h
+++ b/src/optional.h
@@ -5,12 +5,21 @@
 #ifndef BITCOIN_OPTIONAL_H
 #define BITCOIN_OPTIONAL_H
 
+#include <utility>
+
 #include <boost/optional.hpp>
 
 //! Substitute for C++17 std::optional
 template <typename T>
 using Optional = boost::optional<T>;
 
+//! Substitute for C++17 std::make_optional
+template <typename T>
+Optional<T> MakeOptional(bool condition, T&& value)
+{
+    return boost::make_optional(condition, std::forward<T>(value));
+}
+
 //! Substitute for C++17 std::nullopt
 static auto& nullopt = boost::none;