try to make msvc happy

Author: ericniebler

include/exec/finally.hpp

@@ -304,8 +304,8 @@ namespace exec {
 
       template <sender _Final>
       STDEXEC_ATTRIBUTE(always_inline)
-      auto operator()(_Final&& __final) const -> __binder_back<finally_t, __decay_t<_Final>> {
-        return {{static_cast<_Final&&>(__final)}, {}, {}};
+      auto operator()(_Final&& __final) const {
+        return __closure(*this, static_cast<_Final&&>(__final));
       }
 
       template <class _Sender>

include/exec/into_tuple.hpp

@@ -101,8 +101,8 @@ namespace exec {
       }
 
       STDEXEC_ATTRIBUTE(always_inline)
-      constexpr auto operator()() const noexcept -> __binder_back<into_tuple_t> {
-        return {{}, {}, {}};
+      constexpr auto operator()() const noexcept {
+        return __closure(*this);
       }
     };
   } // namespace __into_tuple

include/exec/materialize.hpp

@@ -123,8 +123,8 @@ namespace exec {
       }
 
       STDEXEC_ATTRIBUTE(always_inline)
-      auto operator()() const noexcept -> __binder_back<__materialize_t> {
-        return {{}, {}, {}};
+      auto operator()() const noexcept {
+        return __closure(*this);
       }
     };
   } // namespace __materialize
@@ -233,8 +233,8 @@ namespace exec {
       }
 
       STDEXEC_ATTRIBUTE(always_inline)
-      auto operator()() const noexcept -> __binder_back<__dematerialize_t> {
-        return {{}, {}, {}};
+      auto operator()() const noexcept {
+        return __closure(*this);
       }
     };
   } // namespace __dematerialize

include/exec/repeat_effect_until.hpp

@@ -204,8 +204,8 @@ namespace exec {
       }
 
       STDEXEC_ATTRIBUTE(always_inline)
-      constexpr auto operator()() const -> __binder_back<repeat_effect_until_t> {
-        return {{}, {}, {}};
+      constexpr auto operator()() const {
+        return __closure(*this);
       }
 
       template <class _Sender>
@@ -232,8 +232,8 @@ namespace exec {
       }
 
       STDEXEC_ATTRIBUTE(always_inline)
-      constexpr auto operator()() const -> __binder_back<repeat_effect_t> {
-        return {{}, {}, {}};
+      constexpr auto operator()() const {
+        return __closure(*this);
       }
 
       template <class _Sender>

include/exec/repeat_n.hpp

@@ -202,9 +202,8 @@ namespace exec {
       }
 
       STDEXEC_ATTRIBUTE(always_inline)
-      constexpr auto
-        operator()(std::size_t __count) const -> __binder_back<repeat_n_t, std::size_t> {
-        return {{__count}, {}, {}};
+      constexpr auto operator()(std::size_t __count) const noexcept {
+        return __closure(*this, __count);
       }
 
       template <class _Sender, bool _NoThrow = __nothrow_decay_copyable<_Sender>>

include/exec/sequence/ignore_all_values.hpp

@@ -308,8 +308,8 @@ namespace exec {
       }
 
       STDEXEC_ATTRIBUTE(always_inline)
-      constexpr auto operator()() const noexcept -> __binder_back<ignore_all_values_t> {
-        return {{}, {}, {}};
+      constexpr auto operator()() const noexcept {
+        return __closure(*this);
       }
     };
 

include/exec/sequence/merge.hpp

@@ -82,7 +82,7 @@ namespace exec {
     struct __combine {
       template <class _ReceiverId>
       using merge_each_fn_t =
-        __binder_back<__merge_each_fn<_ReceiverId>, __operation_base<__t<_ReceiverId>>*>;
+        __closure<__merge_each_fn<_ReceiverId>, __operation_base<__t<_ReceiverId>>*>;
 
       template <class _Sequence, class _ReceiverId>
       using transform_sender_t =
@@ -118,7 +118,7 @@ namespace exec {
                 exec::ignore_all_values(
                   exec::transform_each(
                     static_cast<_Sequences&&>(__sequences),
-                    merge_each_fn_t{{this}, {}, {}}))...),
+                    merge_each_fn_t({}, this)))...),
               stdexec::__t<__result_receiver<_ReceiverId>>{this})} {
         }
 
@@ -161,7 +161,6 @@ namespace exec {
 
       template <class... _Env>
       struct __completions_fn_t {
-
         template <class... _Sequences>
         using __f = __meval<
           __concat_completion_signatures,

include/exec/sequence/transform_each.hpp

@@ -161,8 +161,8 @@ namespace exec {
       template <class _Adaptor>
       STDEXEC_ATTRIBUTE(always_inline)
       constexpr auto
-        operator()(_Adaptor __adaptor) const noexcept -> __binder_back<transform_each_t, _Adaptor> {
-        return {{static_cast<_Adaptor&&>(__adaptor)}, {}, {}};
+        operator()(_Adaptor&& __adaptor) const noexcept(__nothrow_decay_copyable<_Adaptor>) {
+        return __closure(*this, static_cast<_Adaptor&&>(__adaptor));
       }
 
       template <class _Self, class... _Env>

include/exec/system_context.hpp

@@ -704,11 +704,6 @@ namespace exec {
     parallel_scheduler __sched_;
   };
 
-  template <class _Sender>
-  struct __not_a_sender {
-    using sender_concept = stdexec::sender_t;
-  };
-
   template <__bulk_chunked_or_unchunked _Sender, class _Env>
   auto __parallel_scheduler_domain::transform_sender(
     stdexec::set_value_t,

include/nvexec/nvtx.cuh

@@ -117,7 +117,8 @@ namespace nvexec {
         STDEXEC_EXPLICIT_THIS_END(connect)
 
         template <__decays_to<__t> Self, class Env>
-        STDEXEC_EXPLICIT_THIS_BEGIN(auto get_completion_signatures)(this Self&&, Env&&) -> _completion_signatures_t<Self, Env> {
+        STDEXEC_EXPLICIT_THIS_BEGIN(auto get_completion_signatures)(this Self&&, Env&&)
+          -> _completion_signatures_t<Self, Env> {
           return {};
         }
         STDEXEC_EXPLICIT_THIS_END(get_completion_signatures)
@@ -140,8 +141,8 @@ namespace nvexec {
       }
 
       STDEXEC_ATTRIBUTE(always_inline)
-      auto operator()(std::string name) const -> stdexec::__binder_back<push_t, std::string> {
-        return {{std::move(name)}, {}, {}};
+      auto operator()(std::string name) const {
+        return stdexec::__closure(*this, std::move(name));
       }
     };
 
@@ -152,8 +153,8 @@ namespace nvexec {
       }
 
       STDEXEC_ATTRIBUTE(always_inline)
-      auto operator()() const noexcept -> stdexec::__binder_back<pop_t> {
-        return {{}, {}, {}};
+      auto operator()() const noexcept {
+        return stdexec::__closure(*this);
       }
     };
 
@@ -168,13 +169,8 @@ namespace nvexec {
 
       template <stdexec::__sender_adaptor_closure Closure>
       STDEXEC_ATTRIBUTE(always_inline)
-      auto operator()(std::string name, Closure closure) const
-        -> stdexec::__binder_back<scoped_t, std::string, Closure> {
-        return {
-          {std::move(name), static_cast<Closure&&>(closure)},
-          {},
-          {}
-        };
+      auto operator()(std::string name, Closure closure) const {
+        return stdexec::__closure(*this, std::move(name), static_cast<Closure&&>(closure));
       }
     };