From c5538d5b141197d5640e7b9c7939bf1310a2858a Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Wed, 16 Feb 2022 21:52:43 +0200
Subject: [PATCH] utils: update optional & expected

Use the latest upstream versions.
---
 lib/utils/expected.hpp | 6 +++---
 lib/utils/optional.hpp | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/utils/expected.hpp b/lib/utils/expected.hpp
index 31a51936..31b130a0 100644
--- a/lib/utils/expected.hpp
+++ b/lib/utils/expected.hpp
@@ -1216,11 +1216,11 @@ class expected : private detail::expected_move_assign_base<T, E>,
                  private detail::expected_delete_assign_base<T, E>,
                  private detail::expected_default_ctor_base<T, E> {
   static_assert(!std::is_reference<T>::value, "T must not be a reference");
-  static_assert(!std::is_same<T, std::remove_cv<in_place_t>>::value,
+  static_assert(!std::is_same<T, std::remove_cv<in_place_t>::type>::value,
                 "T must not be in_place_t");
-  static_assert(!std::is_same<T, std::remove_cv<unexpect_t>>::value,
+  static_assert(!std::is_same<T, std::remove_cv<unexpect_t>::type>::value,
                 "T must not be unexpect_t");
-  static_assert(!std::is_same<T, std::remove_cv<unexpected<E>>>::value,
+  static_assert(!std::is_same<T, typename std::remove_cv<unexpected<E>>::type>::value,
                 "T must not be unexpected<E>");
   static_assert(!std::is_reference<E>::value, "E must not be a reference");
 
diff --git a/lib/utils/optional.hpp b/lib/utils/optional.hpp
index ad8ae2fc..37b774a6 100644
--- a/lib/utils/optional.hpp
+++ b/lib/utils/optional.hpp
@@ -1,7 +1,7 @@
 
 ///
 // optional - An implementation of std::optional with extensions
-// Written in 2017 by Simon Brand (simonrbrand@gmail.com, @TartanLlama)
+// Written in 2017 by Sy Brand (tartanllama@gmail.com, @TartanLlama)
 //
 // Documentation available at https://tl.tartanllama.xyz/
 //
@@ -452,7 +452,8 @@ struct optional_copy_base<T, false> : optional_operations_base<T> {
   using optional_operations_base<T>::optional_operations_base;
 
   optional_copy_base() = default;
-  optional_copy_base(const optional_copy_base &rhs) {
+  optional_copy_base(const optional_copy_base &rhs)
+  : optional_operations_base<T>() {
     if (rhs.has_value()) {
       this->construct(rhs.get());
     } else {