diff --git a/examples/nvexec/maxwell/snr.cuh b/examples/nvexec/maxwell/snr.cuh index ddc358506..5b908abbd 100644 --- a/examples/nvexec/maxwell/snr.cuh +++ b/examples/nvexec/maxwell/snr.cuh @@ -212,7 +212,7 @@ namespace _repeat_n } template Self, ex::receiver Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver r) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver r) -> _repeat_n::opstate { return _repeat_n::opstate(static_cast(self).sndr_, @@ -375,7 +375,7 @@ namespace nv::execution::_strm template Self, ex::receiver Receiver> requires(ex::sender_to) - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver r) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver r) -> nvexec::_strm::_repeat_n::opstate { return nvexec::_strm::_repeat_n::opstate( diff --git a/include/exec/async_scope.hpp b/include/exec/async_scope.hpp index 1242b8759..65f5c5797 100644 --- a/include/exec/async_scope.hpp +++ b/include/exec/async_scope.hpp @@ -124,7 +124,7 @@ namespace experimental::execution template <__decays_to<__when_empty_sender> _Self, receiver _Receiver> requires sender_to<__copy_cvref_t<_Self, _Constrained>, _Receiver> [[nodiscard]] - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this _Self&& __self, _Receiver __rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this _Self&& __self, _Receiver __rcvr) -> __when_empty_opstate_t<_Self, _Receiver> { return __when_empty_opstate_t<_Self, _Receiver>{__self.__scope_, @@ -250,7 +250,7 @@ namespace experimental::execution template <__decays_to<__nest_sender> _Self, receiver _Receiver> requires sender_to<__copy_cvref_t<_Self, _Constrained>, __nest_receiver<_Receiver>> [[nodiscard]] - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this _Self&& __self, _Receiver __rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this _Self&& __self, _Receiver __rcvr) -> __nest_opstate<_Constrained, _Receiver> { return __nest_opstate<_Constrained, _Receiver>{__self.__scope_, @@ -697,7 +697,7 @@ namespace experimental::execution } template <__decays_to<__future> _Self, receiver _Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this _Self&& __self, _Receiver __rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this _Self&& __self, _Receiver __rcvr) -> __future_opstate_t<_Receiver> { return __future_opstate_t<_Receiver>{static_cast<_Receiver&&>(__rcvr), diff --git a/include/exec/create.hpp b/include/exec/create.hpp index 4eea94321..b0cd0cd87 100644 --- a/include/exec/create.hpp +++ b/include/exec/create.hpp @@ -71,7 +71,7 @@ namespace experimental::execution requires __callable<_Fun, __context<_Receiver, _Args>&> && __std::constructible_from<_Fun, __copy_cvref_t<_Self, _Fun>> && __std::constructible_from<_Args, __copy_cvref_t<_Self, _Args>> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this _Self&& __self, _Receiver __rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this _Self&& __self, _Receiver __rcvr) -> __opstate<_Receiver, _Fun, _Args> { static_assert(__nothrow_callable<_Fun, __context<_Receiver, _Args>&>); diff --git a/include/exec/env.hpp b/include/exec/env.hpp index 617d84c8c..288ba127b 100644 --- a/include/exec/env.hpp +++ b/include/exec/env.hpp @@ -179,11 +179,12 @@ namespace experimental::execution using __default_t = __if_c<__callable<_Query, _Env>, __ignore, _Default>; template <__decays_to<__sender> _Self, class _Receiver> - constexpr STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this _Self&& __self, _Receiver __rcvr) - noexcept(__nothrow_constructible_from< - __opstate<_Query, __default_t>, _Receiver>, - __default_t>, - _Receiver>) -> __opstate<_Query, __default_t>, _Receiver> + constexpr auto + STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this _Self&& __self, _Receiver __rcvr) noexcept( + __nothrow_constructible_from<__opstate<_Query, __default_t>, _Receiver>, + __default_t>, + _Receiver>) + -> __opstate<_Query, __default_t>, _Receiver> { using __opstate_t = __opstate<_Query, __default_t>, _Receiver>; return __opstate_t{static_cast<_Self&&>(__self).__default_, @@ -254,7 +255,7 @@ namespace experimental::execution template <__decays_to<__sender> _Self, class _Receiver> requires sender_in<__copy_cvref_t<_Self, _Sender>, env_of_t<_Receiver>> - constexpr STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this _Self&& __self, _Receiver __rcvr) + constexpr auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this _Self&& __self, _Receiver __rcvr) -> connect_result_t<__copy_cvref_t<_Self, _Sender>, _Receiver> { return STDEXEC::connect(std::forward<_Self>(__self).__sndr_, std::move(__rcvr)); diff --git a/include/exec/libdispatch_queue.hpp b/include/exec/libdispatch_queue.hpp index 3eb82aa05..fb61ea4bf 100644 --- a/include/exec/libdispatch_queue.hpp +++ b/include/exec/libdispatch_queue.hpp @@ -316,7 +316,7 @@ namespace experimental::execution bulk_op_state, Receiver, Shape, Fun>; template Self, STDEXEC::receiver Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self &&self, Receiver rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self &&self, Receiver rcvr) noexcept(STDEXEC::__nothrow_constructible_from, libdispatch_queue &, Shape, diff --git a/include/exec/materialize.hpp b/include/exec/materialize.hpp index bf34a2f28..64ec47bbc 100644 --- a/include/exec/materialize.hpp +++ b/include/exec/materialize.hpp @@ -82,7 +82,7 @@ namespace experimental::execution using sender_concept = STDEXEC::sender_tag; template <__decays_to<_sender> Self, class Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) noexcept(__nothrow_connectable<__copy_cvref_t, _receiver>) -> connect_result_t<__copy_cvref_t, _receiver> { @@ -193,7 +193,7 @@ namespace experimental::execution template <__decays_to<_sender> Self, class Receiver> requires sender_to<__copy_cvref_t, _receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) noexcept(__nothrow_connectable<__copy_cvref_t, _receiver>) -> connect_result_t<__copy_cvref_t, _receiver> { diff --git a/include/exec/sequence/ignore_all_values.hpp b/include/exec/sequence/ignore_all_values.hpp index 7b6d8138f..30b1e580a 100644 --- a/include/exec/sequence/ignore_all_values.hpp +++ b/include/exec/sequence/ignore_all_values.hpp @@ -182,7 +182,7 @@ namespace experimental::execution template <__decays_to<__item_sender> _Self, STDEXEC::receiver_of _Receiver> requires sender_to<__copy_cvref_t<_Self, _Sender>, __item_receiver_t<_Receiver>> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this _Self&& __self, _Receiver __rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this _Self&& __self, _Receiver __rcvr) -> __operation_t<_Self, _Receiver> { return {__self.__parent_, diff --git a/include/exec/sequence/merge_each.hpp b/include/exec/sequence/merge_each.hpp index 1db401404..27500a798 100644 --- a/include/exec/sequence/merge_each.hpp +++ b/include/exec/sequence/merge_each.hpp @@ -249,7 +249,7 @@ namespace experimental::execution } template - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this _Self&& __self, _ErrorReceiver&& __rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this _Self&& __self, _ErrorReceiver&& __rcvr) noexcept(__nothrow_move_constructible<_ErrorReceiver>) -> __error_op_t<_ErrorReceiver> { return __error_op_t<_ErrorReceiver>{static_cast<_ErrorReceiver&&>(__rcvr), __self.__op_}; @@ -635,7 +635,7 @@ namespace experimental::execution } template - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this _Self&& __self, _NestedValueReceiver&& __rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this _Self&& __self, _NestedValueReceiver&& __rcvr) noexcept(__nothrow_constructible_from<__nested_value_op_t<_NestedValueReceiver>, _NestedValueReceiver, _NestedValueSender, @@ -1088,7 +1088,7 @@ namespace experimental::execution } template - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this _Self&& __self, _NextReceiver&& __rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this _Self&& __self, _NextReceiver&& __rcvr) noexcept(__nothrow_constructible_from<__next_sequence_op_t<_NextReceiver>, _NextReceiver, _OperationBase*, diff --git a/include/exec/thread_pool_base.hpp b/include/exec/thread_pool_base.hpp index 57816856b..4af3aaf33 100644 --- a/include/exec/thread_pool_base.hpp +++ b/include/exec/thread_pool_base.hpp @@ -586,7 +586,7 @@ namespace experimental::execution // as extra. Without it, clang-format runs connect into the next member. // clang-format off template <__decays_to<_bulk_sender> Self, receiver Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) STDEXEC_AUTO_RETURN(bulk_opstate_t(self.pool_, Shape(self.shape_), static_cast(self).fun_, diff --git a/include/exec/variant_sender.hpp b/include/exec/variant_sender.hpp index 02bdea6cf..3aec2ea67 100644 --- a/include/exec/variant_sender.hpp +++ b/include/exec/variant_sender.hpp @@ -126,7 +126,7 @@ namespace experimental::execution template _Self, STDEXEC::receiver _Receiver> requires(STDEXEC::sender_to, _Receiver> && ...) - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this _Self&& __self, _Receiver __rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this _Self&& __self, _Receiver __rcvr) noexcept((STDEXEC::__nothrow_connectable, _Receiver> && ...)) -> __opstate_t<_Self, _Receiver> { diff --git a/include/exec/when_any.hpp b/include/exec/when_any.hpp index 9f5fa9309..fc86b394a 100644 --- a/include/exec/when_any.hpp +++ b/include/exec/when_any.hpp @@ -227,7 +227,7 @@ namespace experimental::execution {} template <__decay_copyable _Self, receiver _Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this _Self&& __self, _Receiver __rcvr) noexcept( // + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this _Self&& __self, _Receiver __rcvr) noexcept( // STDEXEC::__nothrow_constructible_from<__opstate_t<_Self, _Receiver>, _Receiver, __copy_cvref_t<_Self, _Senders>...>) diff --git a/include/exec/windows/windows_thread_pool.hpp b/include/exec/windows/windows_thread_pool.hpp index 1e37a4465..6a6453dcc 100644 --- a/include/exec/windows/windows_thread_pool.hpp +++ b/include/exec/windows/windows_thread_pool.hpp @@ -1014,7 +1014,7 @@ namespace experimental::execution::__win32 {} template Self, STDEXEC::receiver Rcvr> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self &&self, Rcvr rcvr) -> bulk_op_t + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self &&self, Rcvr rcvr) -> bulk_op_t { return bulk_op_t{*self.pool_, self.shape_, diff --git a/include/nvexec/nvtx.cuh b/include/nvexec/nvtx.cuh index 15cecd107..20d54ac4c 100644 --- a/include/nvexec/nvtx.cuh +++ b/include/nvexec/nvtx.cuh @@ -103,7 +103,7 @@ namespace nv::execution using receiver_t = receiver; template <__decays_to Self, STDEXEC::receiver Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) -> stream_opstate_t<__copy_cvref_t, receiver_t, Receiver> { return stream_opstate<__copy_cvref_t>( diff --git a/include/nvexec/stream/algorithm_base.cuh b/include/nvexec/stream/algorithm_base.cuh index 4886d35d4..fedf41514 100644 --- a/include/nvexec/stream/algorithm_base.cuh +++ b/include/nvexec/stream/algorithm_base.cuh @@ -100,7 +100,7 @@ namespace nv::execution::_strm::__algo_range_init_fun __minvoke_q<__mfirst, DerivedSender, Receiver>::template receiver_t; template <__decays_to_derived_from Self, STDEXEC::receiver Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) -> stream_opstate_t<__copy_cvref_t, receiver_t, Receiver> { return stream_opstate<__copy_cvref_t>( diff --git a/include/nvexec/stream/bulk.cuh b/include/nvexec/stream/bulk.cuh index 43b0e0113..9daf556e8 100644 --- a/include/nvexec/stream/bulk.cuh +++ b/include/nvexec/stream/bulk.cuh @@ -141,7 +141,7 @@ namespace nv::execution::_strm using receiver_t = _bulk::receiver; template <__decays_to Self, receiver Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) -> stream_opstate_t<__copy_cvref_t, receiver_t, Receiver> { return stream_opstate<__copy_cvref_t>( @@ -366,7 +366,7 @@ namespace nv::execution::_strm using sender_concept = STDEXEC::sender_tag; template <__decays_to Self, receiver Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver&& rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver&& rcvr) -> multi_gpu_bulk::opstate<__copy_cvref_t, Receiver, Shape, Fun> { auto sch = STDEXEC::get_completion_scheduler(STDEXEC::get_env(self.sndr_), diff --git a/include/nvexec/stream/continues_on.cuh b/include/nvexec/stream/continues_on.cuh index 394749c26..0aafc03f2 100644 --- a/include/nvexec/stream/continues_on.cuh +++ b/include/nvexec/stream/continues_on.cuh @@ -230,7 +230,7 @@ namespace nv::execution::_strm {} template <__decay_copyable Self, STDEXEC::receiver Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) -> connect_result_t<__copy_cvref_t, Receiver> { return STDEXEC::connect(static_cast(self).sndr_, static_cast(rcvr)); @@ -271,7 +271,7 @@ namespace nv::execution::_strm using opstate_t = _trnsfr::opstate<__copy_cvref_t, Receiver>; template <__decays_to Self, receiver Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) // + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) // -> opstate_t { // Work before the transition keeps running on its own scheduler's stream. diff --git a/include/nvexec/stream/launch.cuh b/include/nvexec/stream/launch.cuh index e294e723f..c05e0c52d 100644 --- a/include/nvexec/stream/launch.cuh +++ b/include/nvexec/stream/launch.cuh @@ -134,7 +134,7 @@ namespace nv::execution using receiver_t = _launch::receiver; template <__decays_to Self, STDEXEC::receiver Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) -> stream_opstate_t<__copy_cvref_t, receiver_t, Receiver> { return stream_opstate<__copy_cvref_t>( diff --git a/include/nvexec/stream/let_xxx.cuh b/include/nvexec/stream/let_xxx.cuh index 13dc70b4c..6d58819ce 100644 --- a/include/nvexec/stream/let_xxx.cuh +++ b/include/nvexec/stream/let_xxx.cuh @@ -287,7 +287,7 @@ namespace nv::execution::_strm } template - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) -> _opstate_t { return _opstate_t{static_cast(self).sndr_, diff --git a/include/nvexec/stream/schedule_from.cuh b/include/nvexec/stream/schedule_from.cuh index 35a98e748..ca0549404 100644 --- a/include/nvexec/stream/schedule_from.cuh +++ b/include/nvexec/stream/schedule_from.cuh @@ -146,7 +146,7 @@ namespace nv::execution {} template <__decays_to Self, STDEXEC::receiver Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) -> opstate_t { return opstate_t{static_cast(self).sndr_, diff --git a/include/nvexec/stream/then.cuh b/include/nvexec/stream/then.cuh index ce8fa0afd..3ed40e2f2 100644 --- a/include/nvexec/stream/then.cuh +++ b/include/nvexec/stream/then.cuh @@ -160,7 +160,7 @@ namespace nv::execution::_strm {} template <__decays_to Self, STDEXEC::receiver Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) -> stream_opstate_t<__copy_cvref_t, receiver_t, Receiver> { return stream_opstate<__copy_cvref_t>( diff --git a/include/nvexec/stream/upon_error.cuh b/include/nvexec/stream/upon_error.cuh index 7535a290d..092e1e09e 100644 --- a/include/nvexec/stream/upon_error.cuh +++ b/include/nvexec/stream/upon_error.cuh @@ -161,7 +161,7 @@ namespace nv::execution::_strm {} template <__decays_to Self, receiver Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) -> stream_opstate_t<__copy_cvref_t, receiver_t, Receiver> { return stream_opstate<__copy_cvref_t>( diff --git a/include/nvexec/stream/upon_stopped.cuh b/include/nvexec/stream/upon_stopped.cuh index 84e95cb97..6a71a3da9 100644 --- a/include/nvexec/stream/upon_stopped.cuh +++ b/include/nvexec/stream/upon_stopped.cuh @@ -149,7 +149,7 @@ namespace nv::execution::_strm {} template <__decays_to Self, STDEXEC::receiver Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) -> stream_opstate_t<__copy_cvref_t, _receiver_t, Receiver> { return stream_opstate<__copy_cvref_t>( diff --git a/include/nvexec/stream/when_all.cuh b/include/nvexec/stream/when_all.cuh index 5acb7da88..ef766892a 100644 --- a/include/nvexec/stream/when_all.cuh +++ b/include/nvexec/stream/when_all.cuh @@ -141,7 +141,7 @@ namespace nv::execution::_strm {} template <__decays_to Self, receiver Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) -> opstate<__copy_cvref_t> { return {static_cast(self), static_cast(rcvr)}; diff --git a/include/stdexec/__detail/__config.hpp b/include/stdexec/__detail/__config.hpp index cda5b157b..3cfcff913 100644 --- a/include/stdexec/__detail/__config.hpp +++ b/include/stdexec/__detail/__config.hpp @@ -887,7 +887,7 @@ namespace STDEXEC /// /// @code /// template <__std::same_as Self, class Receiver> -/// STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) { +/// auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) { /// return ...; /// } /// STDEXEC_EXPLICIT_THIS_END(connect) @@ -912,16 +912,12 @@ namespace STDEXEC _NAME)) # define STDEXEC_EXPLICIT_THIS_EAT_this -# define STDEXEC_EXPLICIT_THIS_MANGLE_auto auto STDEXEC_EXPLICIT_THIS_MANGLE STDEXEC_PP_LPAREN() -# define STDEXEC_EXPLICIT_THIS_MANGLE_void void STDEXEC_EXPLICIT_THIS_MANGLE STDEXEC_PP_LPAREN() -# define STDEXEC_EXPLICIT_THIS_MANGLE_bool bool STDEXEC_EXPLICIT_THIS_MANGLE STDEXEC_PP_LPAREN() # define STDEXEC_EXPLICIT_THIS_ARGS(...) \ - STDEXEC_PP_CAT(STDEXEC_EXPLICIT_THIS_EAT_, __VA_ARGS__) STDEXEC_PP_RPAREN() + (STDEXEC_PP_CAT(STDEXEC_EXPLICIT_THIS_EAT_, __VA_ARGS__)) # define STDEXEC_EXPLICIT_THIS_BEGIN(...) \ - static STDEXEC_PP_EXPAND(STDEXEC_PP_CAT(STDEXEC_EXPLICIT_THIS_MANGLE_, __VA_ARGS__) \ - STDEXEC_PP_RPAREN()) STDEXEC_PP_LPAREN() STDEXEC_EXPLICIT_THIS_ARGS + static STDEXEC_EXPLICIT_THIS_MANGLE(__VA_ARGS__) STDEXEC_EXPLICIT_THIS_ARGS # define STDEXEC_EXPLICIT_THIS_END(_NAME) \ template \ diff --git a/include/stdexec/__detail/__finally.hpp b/include/stdexec/__detail/__finally.hpp index 51a1e6e10..3dbcb60a1 100644 --- a/include/stdexec/__detail/__finally.hpp +++ b/include/stdexec/__detail/__finally.hpp @@ -361,8 +361,8 @@ namespace STDEXEC _Receiver>; template <__decays_to<__sender> _Self, class _Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this _Self&& __self, - _Receiver&& __receiver) noexcept + auto + STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this _Self&& __self, _Receiver&& __receiver) noexcept -> __opstate_t<_Self, _Receiver> { return __opstate_t<_Self, _Receiver>{static_cast<_Self&&>(__self).__initial_sndr_, diff --git a/include/stdexec/__detail/__sender_adaptor_closure.hpp b/include/stdexec/__detail/__sender_adaptor_closure.hpp index d22b5500c..3bbe5b221 100644 --- a/include/stdexec/__detail/__sender_adaptor_closure.hpp +++ b/include/stdexec/__detail/__sender_adaptor_closure.hpp @@ -102,7 +102,7 @@ namespace STDEXEC template requires __callable<__copy_cvref_t<_Self, _Fn>, _Sender, __copy_cvref_t<_Self, _As>...> STDEXEC_ATTRIBUTE(host, device, always_inline) - constexpr STDEXEC_EXPLICIT_THIS_BEGIN(auto operator())(this _Self&& __self, _Sender&& __sndr) + constexpr auto STDEXEC_EXPLICIT_THIS_BEGIN(operator())(this _Self&& __self, _Sender&& __sndr) noexcept( __nothrow_callable<__copy_cvref_t<_Self, _Fn>, _Sender, __copy_cvref_t<_Self, _As>...>) { diff --git a/include/stdexec/__detail/__sequence.hpp b/include/stdexec/__detail/__sequence.hpp index d7830f6bc..ddde220cb 100644 --- a/include/stdexec/__detail/__sequence.hpp +++ b/include/stdexec/__detail/__sequence.hpp @@ -436,7 +436,7 @@ namespace STDEXEC } template - constexpr STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this _Self &&__self, _Receiver __rcvr) + constexpr auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this _Self &&__self, _Receiver __rcvr) noexcept(__nothrow_constructible_from<__opstate_t<_Self, _Receiver>, __copy_cvref_t<_Self, _Sender1>, __copy_cvref_t<_Self, _Sender2>, diff --git a/include/stdexec/__detail/__storage.hpp b/include/stdexec/__detail/__storage.hpp index fc53ffa42..54ee0478c 100644 --- a/include/stdexec/__detail/__storage.hpp +++ b/include/stdexec/__detail/__storage.hpp @@ -79,7 +79,7 @@ namespace STDEXEC template STDEXEC_ATTRIBUTE(host, device) - constexpr STDEXEC_EXPLICIT_THIS_BEGIN(void __complete)(this _Self&& __self, + constexpr void STDEXEC_EXPLICIT_THIS_BEGIN(__complete)(this _Self&& __self, _Receiver& __rcvr) noexcept { __visit(__detail::__visitor(), static_cast<_Self&&>(__self), __rcvr); diff --git a/include/stdexec/functional.hpp b/include/stdexec/functional.hpp index 9e7d3f799..706d6d3ee 100644 --- a/include/stdexec/functional.hpp +++ b/include/stdexec/functional.hpp @@ -50,7 +50,7 @@ namespace STDEXEC && __callable<__copy_cvref_t<_Self, _Fun0>, __call_result_t<__copy_cvref_t<_Self, _Fun1>, _Ts...>> STDEXEC_ATTRIBUTE(host, device, always_inline) - constexpr STDEXEC_EXPLICIT_THIS_BEGIN(auto operator())(this _Self &&__self, _Ts &&...__ts) + constexpr auto STDEXEC_EXPLICIT_THIS_BEGIN(operator())(this _Self &&__self, _Ts &&...__ts) STDEXEC_AUTO_RETURN( static_cast<_Self &&>(__self).__fun0_( static_cast<_Self &&>(__self).__fun1_(static_cast<_Ts &&>(__ts)...))) @@ -290,7 +290,7 @@ namespace STDEXEC { template STDEXEC_ATTRIBUTE(host, device, always_inline) - constexpr STDEXEC_EXPLICIT_THIS_BEGIN(auto operator())(this _Self &&__self, _Ts &&...) noexcept + constexpr auto STDEXEC_EXPLICIT_THIS_BEGIN(operator())(this _Self &&__self, _Ts &&...) noexcept -> auto && { return (static_cast<_Self &&>(__self).__value_); @@ -365,7 +365,7 @@ namespace STDEXEC //! arguments. template requires __callable<__1st_fn_t<_Self, _Args...>, _Args...> - constexpr STDEXEC_EXPLICIT_THIS_BEGIN(auto operator())(this _Self &&__self, _Args &&...__args) + constexpr auto STDEXEC_EXPLICIT_THIS_BEGIN(operator())(this _Self &&__self, _Args &&...__args) noexcept(__nothrow_callable<__1st_fn_t<_Self, _Args...>, _Args...>) -> __call_result_t<__1st_fn_t<_Self, _Args...>, _Args...> { @@ -386,7 +386,7 @@ namespace STDEXEC template requires __callable<__copy_cvref_t<_Self, _Fn>, _Args..., __copy_cvref_t<_Self, _BoundArgs>...> STDEXEC_ATTRIBUTE(host, device) - constexpr STDEXEC_EXPLICIT_THIS_BEGIN(auto operator())(this _Self &&__self, + constexpr auto STDEXEC_EXPLICIT_THIS_BEGIN(operator())(this _Self &&__self, _Args &&...__args) // noexcept(__nothrow_callable<__copy_cvref_t<_Self, _Fn>, _Args..., @@ -461,7 +461,7 @@ namespace STDEXEC template requires __callable<__copy_cvref_t<_Self, _Fn>, _T1, _T0> STDEXEC_ATTRIBUTE(host, device) - constexpr STDEXEC_EXPLICIT_THIS_BEGIN(auto operator())(this _Self &&__self, + constexpr auto STDEXEC_EXPLICIT_THIS_BEGIN(operator())(this _Self &&__self, _T0 &&__t0, _T1 &&__t1) noexcept(__nothrow_callable<__copy_cvref_t<_Self, _Fn>, _T1, _T0>) diff --git a/test/exec/sequence/test_any_sequence_of.cpp b/test/exec/sequence/test_any_sequence_of.cpp index dd06f3130..00be6f18e 100644 --- a/test/exec/sequence/test_any_sequence_of.cpp +++ b/test/exec/sequence/test_any_sequence_of.cpp @@ -65,7 +65,7 @@ namespace template Self, STDEXEC::receiver_of Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) noexcept + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) noexcept { return STDEXEC::connect(static_cast(self).item_, ignore_all_item_rcvr{static_cast(rcvr)}); diff --git a/test/exec/sequence/test_iterate.cpp b/test/exec/sequence/test_iterate.cpp index 66e73c906..a3923d7a6 100644 --- a/test/exec/sequence/test_iterate.cpp +++ b/test/exec/sequence/test_iterate.cpp @@ -213,7 +213,7 @@ namespace template Self, STDEXEC::receiver_of Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) noexcept + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) noexcept { return STDEXEC::connect(static_cast(self).item_, sum_item_rcvr{static_cast(rcvr), self.sum_}); diff --git a/test/nvexec/common.cuh b/test/nvexec/common.cuh index 289c15e02..b0814fcdc 100644 --- a/test/nvexec/common.cuh +++ b/test/nvexec/common.cuh @@ -173,7 +173,7 @@ namespace template Self, STDEXEC::receiver Receiver> requires STDEXEC::receiver_of>> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver&& rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver&& rcvr) -> op_t { return op_t(static_cast(self).sndr_, @@ -237,7 +237,7 @@ namespace template Self, STDEXEC::receiver Receiver> requires STDEXEC::receiver_of>> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver&& rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver&& rcvr) -> op_t { return op_t(static_cast(self).sndr_, static_cast(rcvr)); diff --git a/test/stdexec/algos/adaptors/test_on3.cpp b/test/stdexec/algos/adaptors/test_on3.cpp index fff56e76e..0cdb85575 100644 --- a/test/stdexec/algos/adaptors/test_on3.cpp +++ b/test/stdexec/algos/adaptors/test_on3.cpp @@ -65,7 +65,7 @@ namespace Sndr sndr; template Self, ex::receiver Rcvr> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Rcvr rcvr) + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Rcvr rcvr) { return ex::connect(static_cast(self).sndr, get_env_rcvr{static_cast(rcvr)}); diff --git a/test/test_common/senders.hpp b/test/test_common/senders.hpp index 25d24e57d..405af357f 100644 --- a/test/test_common/senders.hpp +++ b/test/test_common/senders.hpp @@ -239,7 +239,7 @@ namespace }; template Self, class Receiver> - STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self&& self, Receiver rcvr) noexcept + auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self&& self, Receiver rcvr) noexcept -> operation { return {self.condition_, std::forward(rcvr)};