Merge pull request #99 from jiixyj/reorder-constructor-constraints

Modify constructor constraints to make 'optional<any>' work on libc++
bemanproject · Jan 6, 2025 · 4e8377f · 4e8377f
2 parents bb60b34 + 7cb9b44
commit 4e8377f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/include/beman/optional26/optional.hpp b/include/beman/optional26/optional.hpp
@@ -197,12 +197,12 @@ struct hash<optional<T>>;
 
 namespace detail {
 template <class T, class U>
-concept enable_forward_value = std::is_constructible_v<T, U&&> && !std::is_same_v<std::decay_t<U>, in_place_t> &&
-                               !std::is_same_v<optional<T>, std::decay_t<U>>;
+concept enable_forward_value = !std::is_same_v<std::decay_t<U>, optional<T>> &&
+                               !std::is_same_v<std::decay_t<U>, in_place_t> && std::is_constructible_v<T, U&&>;
 
 template <class T, class U, class Other>
 concept enable_from_other =
-    std::is_constructible_v<T, Other> && !std::is_constructible_v<T, optional<U>&> &&
+    !std::is_same_v<T, U> && std::is_constructible_v<T, Other> && !std::is_constructible_v<T, optional<U>&> &&
     !std::is_constructible_v<T, optional<U>&&> && !std::is_constructible_v<T, const optional<U>&> &&
     !std::is_constructible_v<T, const optional<U>&&> && !std::is_convertible_v<optional<U>&, T> &&
     !std::is_convertible_v<optional<U>&&, T> && !std::is_convertible_v<const optional<U>&, T> &&

diff --git a/src/beman/optional26/tests/optional.t.cpp b/src/beman/optional26/tests/optional.t.cpp
@@ -11,6 +11,7 @@
 #include <ranges>
 #include <tuple>
 #include <algorithm>
+#include <any>
 
 #include <gtest/gtest.h>
 
@@ -1005,3 +1006,13 @@ TEST(OptionalTest, OptionalFromOptionalConstRefExplicit) {
     beman::optional26::optional<copyable_from_const_lvalue_only> o5(std::move(o3));
     ASSERT_TRUE(o5);
 }
+
+TEST(OptionalTest, OptionalOfAnyWorks) {
+    beman::optional26::optional<std::any> o1 = 42;
+
+    beman::optional26::optional<std::any> o2 = o1;
+    EXPECT_TRUE(std::any_cast<const int&>(*o2) == 42);
+
+    beman::optional26::optional<std::any> o3 = std::move(o1);
+    EXPECT_TRUE(std::any_cast<const int&>(*o3) == 42);
+}