Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/nvexec/maxwell/snr.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ namespace _repeat_n
}

template <ex::__decays_to<sender> 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<Sender, Closure, Receiver>
{
return _repeat_n::opstate<Sender, Closure, Receiver>(static_cast<Self&&>(self).sndr_,
Expand Down Expand Up @@ -375,7 +375,7 @@ namespace nv::execution::_strm

template <ex::__decays_to<sender> Self, ex::receiver Receiver>
requires(ex::sender_to<Sender, Receiver>)
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<Sender, Closure, Receiver>
{
return nvexec::_strm::_repeat_n::opstate<Sender, Closure, Receiver>(
Expand Down
6 changes: 3 additions & 3 deletions include/exec/async_scope.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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_,
Expand Down Expand Up @@ -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_,
Expand Down Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion include/exec/create.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>&>);
Expand Down
13 changes: 7 additions & 6 deletions include/exec/env.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<env_of_t<_Receiver>>, _Receiver>,
__default_t<env_of_t<_Receiver>>,
_Receiver>) -> __opstate<_Query, __default_t<env_of_t<_Receiver>>, _Receiver>
constexpr auto
STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this _Self&& __self, _Receiver __rcvr) noexcept(
__nothrow_constructible_from<__opstate<_Query, __default_t<env_of_t<_Receiver>>, _Receiver>,
__default_t<env_of_t<_Receiver>>,
_Receiver>)
-> __opstate<_Query, __default_t<env_of_t<_Receiver>>, _Receiver>
{
using __opstate_t = __opstate<_Query, __default_t<env_of_t<_Receiver>>, _Receiver>;
return __opstate_t{static_cast<_Self&&>(__self).__default_,
Expand Down Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion include/exec/libdispatch_queue.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ namespace experimental::execution
bulk_op_state<STDEXEC::__copy_cvref_t<Self, Sender>, Receiver, Shape, Fun>;

template <STDEXEC::__decays_to<bulk_sender> 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<bulk_op_state_t<Self, Receiver>,
libdispatch_queue &,
Shape,
Expand Down
4 changes: 2 additions & 2 deletions include/exec/materialize.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Self, Sender>, _receiver<Receiver>>)
-> connect_result_t<__copy_cvref_t<Self, Sender>, _receiver<Receiver>>
{
Expand Down Expand Up @@ -193,7 +193,7 @@ namespace experimental::execution

template <__decays_to<_sender> Self, class Receiver>
requires sender_to<__copy_cvref_t<Self, Sender>, _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(__nothrow_connectable<__copy_cvref_t<Self, Sender>, _receiver<Receiver>>)
-> connect_result_t<__copy_cvref_t<Self, Sender>, _receiver<Receiver>>
{
Expand Down
2 changes: 1 addition & 1 deletion include/exec/sequence/ignore_all_values.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ namespace experimental::execution
template <__decays_to<__item_sender> _Self,
STDEXEC::receiver_of<completion_signatures> _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_,
Expand Down
6 changes: 3 additions & 3 deletions include/exec/sequence/merge_each.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ namespace experimental::execution
}

template <class _Self, receiver _ErrorReceiver>
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_};
Expand Down Expand Up @@ -635,7 +635,7 @@ namespace experimental::execution
}

template <class _Self, receiver _NestedValueReceiver>
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,
Expand Down Expand Up @@ -1088,7 +1088,7 @@ namespace experimental::execution
}

template <class _Self, receiver _NextReceiver>
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*,
Expand Down
2 changes: 1 addition & 1 deletion include/exec/thread_pool_base.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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, Receiver>(self.pool_,
Shape(self.shape_),
static_cast<Self&&>(self).fun_,
Expand Down
2 changes: 1 addition & 1 deletion include/exec/variant_sender.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ namespace experimental::execution

template <STDEXEC::__decays_to<variant_sender> _Self, STDEXEC::receiver _Receiver>
requires(STDEXEC::sender_to<STDEXEC::__copy_cvref_t<_Self, _Senders>, _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<STDEXEC::__copy_cvref_t<_Self, _Senders>, _Receiver>
&& ...)) -> __opstate_t<_Self, _Receiver>
{
Expand Down
2 changes: 1 addition & 1 deletion include/exec/when_any.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>...>)
Expand Down
2 changes: 1 addition & 1 deletion include/exec/windows/windows_thread_pool.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,7 @@ namespace experimental::execution::__win32
{}

template <STDEXEC::__decays_to<bulk_sender> Self, STDEXEC::receiver Rcvr>
STDEXEC_EXPLICIT_THIS_BEGIN(auto connect)(this Self &&self, Rcvr rcvr) -> bulk_op_t<Self, Rcvr>
auto STDEXEC_EXPLICIT_THIS_BEGIN(connect)(this Self &&self, Rcvr rcvr) -> bulk_op_t<Self, Rcvr>
{
return bulk_op_t<Self, Rcvr>{*self.pool_,
self.shape_,
Expand Down
2 changes: 1 addition & 1 deletion include/nvexec/nvtx.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ namespace nv::execution
using receiver_t = receiver<Kind, Receiver>;

template <__decays_to<nvtx_sender> 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<Self, Sender>, receiver_t<Receiver>, Receiver>
{
return stream_opstate<__copy_cvref_t<Self, Sender>>(
Expand Down
2 changes: 1 addition & 1 deletion include/nvexec/stream/algorithm_base.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ namespace nv::execution::_strm::__algo_range_init_fun
__minvoke_q<__mfirst, DerivedSender, Receiver>::template receiver_t<Receiver>;

template <__decays_to_derived_from<sender> 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<Self, Sender>, receiver_t<Receiver>, Receiver>
{
return stream_opstate<__copy_cvref_t<Self, Sender>>(
Expand Down
4 changes: 2 additions & 2 deletions include/nvexec/stream/bulk.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ namespace nv::execution::_strm
using receiver_t = _bulk::receiver<Receiver, Shape, Fun>;

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)
-> stream_opstate_t<__copy_cvref_t<Self, Sender>, receiver_t<Receiver>, Receiver>
{
return stream_opstate<__copy_cvref_t<Self, Sender>>(
Expand Down Expand Up @@ -366,7 +366,7 @@ namespace nv::execution::_strm
using sender_concept = STDEXEC::sender_tag;

template <__decays_to<multi_gpu_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)
-> multi_gpu_bulk::opstate<__copy_cvref_t<Self, Sender>, Receiver, Shape, Fun>
{
auto sch = STDEXEC::get_completion_scheduler<set_value_t>(STDEXEC::get_env(self.sndr_),
Expand Down
4 changes: 2 additions & 2 deletions include/nvexec/stream/continues_on.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -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<Self, Sender>, Receiver>
{
return STDEXEC::connect(static_cast<Self&&>(self).sndr_, static_cast<Receiver&&>(rcvr));
Expand Down Expand Up @@ -271,7 +271,7 @@ namespace nv::execution::_strm
using opstate_t = _trnsfr::opstate<__copy_cvref_t<Self, source_sender_t>, Receiver>;

template <__decays_to<continues_on_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) //
-> opstate_t<Self, Receiver>
{
// Work before the transition keeps running on its own scheduler's stream.
Expand Down
2 changes: 1 addition & 1 deletion include/nvexec/stream/launch.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ namespace nv::execution
using receiver_t = _launch::receiver<Receiver, Fun>;

template <__decays_to<launch_sender> 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<Self, Sender>, receiver_t<Receiver>, Receiver>
{
return stream_opstate<__copy_cvref_t<Self, Sender>>(
Expand Down
2 changes: 1 addition & 1 deletion include/nvexec/stream/let_xxx.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ namespace nv::execution::_strm
}

template <class 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<Self, Receiver>
{
return _opstate_t<Self, Receiver>{static_cast<Self&&>(self).sndr_,
Expand Down
2 changes: 1 addition & 1 deletion include/nvexec/stream/schedule_from.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ namespace nv::execution
{}

template <__decays_to<schedule_from_sender> 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<Self, Receiver>
{
return opstate_t<Self, Receiver>{static_cast<Self&&>(self).sndr_,
Expand Down
2 changes: 1 addition & 1 deletion include/nvexec/stream/then.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ namespace nv::execution::_strm
{}

template <__decays_to<then_sender> 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<Self, Sender>, receiver_t<Receiver>, Receiver>
{
return stream_opstate<__copy_cvref_t<Self, Sender>>(
Expand Down
2 changes: 1 addition & 1 deletion include/nvexec/stream/upon_error.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ namespace nv::execution::_strm
{}

template <__decays_to<upon_error_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)
-> stream_opstate_t<__copy_cvref_t<Self, Sender>, receiver_t<Receiver>, Receiver>
{
return stream_opstate<__copy_cvref_t<Self, Sender>>(
Expand Down
2 changes: 1 addition & 1 deletion include/nvexec/stream/upon_stopped.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ namespace nv::execution::_strm
{}

template <__decays_to<upon_stopped_sender> 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<Self, Sender>, _receiver_t<Receiver>, Receiver>
{
return stream_opstate<__copy_cvref_t<Self, Sender>>(
Expand Down
2 changes: 1 addition & 1 deletion include/nvexec/stream/when_all.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ namespace nv::execution::_strm
{}

template <__decays_to<when_all_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)
-> opstate<__copy_cvref_t<Self, Receiver>>
{
return {static_cast<Self&&>(self), static_cast<Receiver&&>(rcvr)};
Expand Down
10 changes: 3 additions & 7 deletions include/stdexec/__detail/__config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ namespace STDEXEC
///
/// @code
/// template <__std::same_as<self_t> 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)
Expand All @@ -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 <class... _Ts> \
Expand Down
4 changes: 2 additions & 2 deletions include/stdexec/__detail/__finally.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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_,
Expand Down
2 changes: 1 addition & 1 deletion include/stdexec/__detail/__sender_adaptor_closure.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ namespace STDEXEC
template <class _Self, sender _Sender>
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>...>)
{
Expand Down
2 changes: 1 addition & 1 deletion include/stdexec/__detail/__sequence.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ namespace STDEXEC
}

template <class _Self, class _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)
noexcept(__nothrow_constructible_from<__opstate_t<_Self, _Receiver>,
__copy_cvref_t<_Self, _Sender1>,
__copy_cvref_t<_Self, _Sender2>,
Expand Down
Loading
Loading