From b94ea19e51e836adec7bc0fdbc7a47a1f346cbc5 Mon Sep 17 00:00:00 2001
From: Jacob Lifshay <programmerjake@gmail.com>
Date: Fri, 16 Jun 2017 15:45:45 -0700
Subject: [PATCH] fix util::optional copy/move constructors

---
 src/util/optional.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/util/optional.h b/src/util/optional.h
index 3186719..99b748d 100644
--- a/src/util/optional.h
+++ b/src/util/optional.h
@@ -402,6 +402,10 @@ public:
     using Base::reset;
     using Base::emplace;
     constexpr optional() noexcept = default;
+    constexpr optional(const optional &) noexcept(std::is_nothrow_copy_constructible<T>::value) =
+        default;
+    constexpr optional(optional &&) noexcept(std::is_nothrow_move_constructible<T>::value) =
+        default;
     template <typename U,
               typename = typename std::
                   enable_if<detail::optional_needs_conversion_constructors<T, U, const U &>()
@@ -468,8 +472,10 @@ public:
         : Base(in_place, std::forward<U>(value))
     {
     }
-    optional &operator=(const optional &) = default;
-    optional &operator=(optional &&) = default;
+    constexpr optional &operator=(const optional &) noexcept(
+        std::is_nothrow_copy_assignable<T>::value) = default;
+    constexpr optional &operator=(optional &&) noexcept(std::is_nothrow_move_assignable<T>::value) =
+        default;
     template <typename U = T,
               typename = typename std::
                   enable_if<!std::is_same<typename std::decay<U>::type, optional>::value
-- 
2.30.2