Revert part of 4d9aa3b that currently breaks Zeek build

zeek · Dec 6, 2024 · 5bcc42f · 5bcc42f
1 parent 5c9f59f
commit 5bcc42f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/libbroker/broker/expected.hh b/libbroker/broker/expected.hh
@@ -40,6 +40,12 @@ public:
 
   // -- constructors, destructors, and assignment operators --------------------
 
+  template <class U>
+  expected(U x, std::enable_if_t<std::is_convertible_v<U, T>>* = nullptr)
+    : engaged_(true) {
+    new (std::addressof(value_)) T(std::move(x));
+  }
+
   expected(T&& x) noexcept(nothrow_move) : engaged_(true) {
     new (std::addressof(value_)) T(std::move(x));
   }