Allow copying/movingvariant_sender

variant_sender's perfect forwarding constructor hid the move and copy constructors.
ccotter · Jan 3, 2024 · b729180 · b729180
1 parent 4724b8d
commit b729180
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/include/unifex/variant_sender.hpp b/include/unifex/variant_sender.hpp
@@ -117,7 +117,8 @@ class _sender<Senders...>::type {
   static constexpr bool is_always_scheduler_affine =
       (sender_traits<Senders>::is_always_scheduler_affine && ...);
 
-  template <typename ConcreteSender>
+  template (typename ConcreteSender)
+    (requires is_one_of_v<std::decay_t<ConcreteSender>, Senders...>)
   type(ConcreteSender&& concreteSender) noexcept(
       std::is_nothrow_constructible_v<
           std::variant<Senders...>,

diff --git a/test/variant_sender_test.cpp b/test/variant_sender_test.cpp
@@ -283,3 +283,9 @@ TEST(Variant, TestMSVCCpp20RegressionScenario) {
 
   ASSERT_TRUE(ret.has_value());
 }
+
+TEST(Variant, CopyableAndMovable) {
+  variant_sender<decltype(just(5)), decltype(just(1.0))> just_variant_sender(just(5));
+  auto other = just_variant_sender;
+  other = std::move(just_variant_sender);
+}