diff --git a/docs/source/developer/index.rst b/docs/source/developer/index.rst index 994460a40..ecaa7ff43 100644 --- a/docs/source/developer/index.rst +++ b/docs/source/developer/index.rst @@ -87,7 +87,7 @@ member functions that handle completion: .. code-block:: cpp struct MyReceiver { - using receiver_concept = stdexec::receiver_t; + using receiver_concept = stdexec::receiver_tag; void set_value(int v) noexcept { /* success */ } void set_error(std::exception_ptr e) noexcept { /* error */ } diff --git a/examples/algorithms/retry.hpp b/examples/algorithms/retry.hpp index c4d34488f..be05fa383 100644 --- a/examples/algorithms/retry.hpp +++ b/examples/algorithms/retry.hpp @@ -121,7 +121,7 @@ struct _op template struct _retry_sender { - using sender_concept = stdexec::sender_t; + using sender_concept = stdexec::sender_tag; S s_; explicit _retry_sender(S s) diff --git a/examples/algorithms/then.hpp b/examples/algorithms/then.hpp index 4288a0bee..cd088f06f 100644 --- a/examples/algorithms/then.hpp +++ b/examples/algorithms/then.hpp @@ -59,7 +59,7 @@ class _then_receiver : public exec::receiver_adaptor<_then_receiver, R> template struct _then_sender { - using sender_concept = stdexec::sender_t; + using sender_concept = stdexec::sender_tag; S s_; F f_; diff --git a/examples/benchmark/fibonacci.cpp b/examples/benchmark/fibonacci.cpp index 110cc5e61..e2e735468 100644 --- a/examples/benchmark/fibonacci.cpp +++ b/examples/benchmark/fibonacci.cpp @@ -38,7 +38,7 @@ using fib_sender = any_sender_of; template struct fib_s { - using sender_concept = stdexec::sender_t; + using sender_concept = stdexec::sender_tag; using completion_signatures = stdexec::completion_signatures; long cutoff; diff --git a/examples/nvexec/maxwell/snr.cuh b/examples/nvexec/maxwell/snr.cuh index 0497d3e1e..d8d7b5e16 100644 --- a/examples/nvexec/maxwell/snr.cuh +++ b/examples/nvexec/maxwell/snr.cuh @@ -33,12 +33,12 @@ namespace nvexec { struct stream_receiver_base { - using receiver_concept = ex::receiver_t; + using receiver_concept = ex::receiver_tag; }; struct stream_sender_base { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; }; namespace detail @@ -97,7 +97,7 @@ namespace _repeat_n { using receiver_t = OpState::receiver_t; public: - using receiver_concept = ex::receiver_t; + using receiver_concept = ex::receiver_tag; explicit receiver(OpState& op_state) : opstate_(op_state) @@ -198,7 +198,7 @@ namespace _repeat_n template struct sender { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; template static consteval auto get_completion_signatures() noexcept @@ -352,7 +352,7 @@ namespace nv::execution::_strm template struct sender { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; using completion_signatures = ex::completion_signatures; diff --git a/examples/scope.cpp b/examples/scope.cpp index 8a166960c..102aecb67 100644 --- a/examples/scope.cpp +++ b/examples/scope.cpp @@ -29,7 +29,7 @@ using stdexec::sync_wait; struct noop_receiver { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; template void set_value(_As&&...) noexcept diff --git a/include/exec/any_sender_of.hpp b/include/exec/any_sender_of.hpp index 3de8c291b..d5e26fce8 100644 --- a/include/exec/any_sender_of.hpp +++ b/include/exec/any_sender_of.hpp @@ -261,7 +261,7 @@ namespace experimental::execution private: using _base_t = STDEXEC::__any::__interface_base<_isemi_receiver, Base, _extends_base_t>; public: - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; using _base_t::_base_t; }; @@ -402,7 +402,7 @@ namespace experimental::execution template struct _iopstate : _iopstate_base_t { - using operation_state_concept = STDEXEC::operation_state_t; + using operation_state_concept = STDEXEC::operation_state_tag; using _iopstate_base_t::_iopstate_base_t; virtual constexpr void start() & noexcept @@ -425,7 +425,7 @@ namespace experimental::execution template struct _any_opstate { - using operation_state_concept = STDEXEC::operation_state_t; + using operation_state_concept = STDEXEC::operation_state_tag; template constexpr explicit _any_opstate(AnySender &&_sndr, Receiver _rcvr) @@ -473,7 +473,7 @@ namespace experimental::execution using _any_receiver_ref_t = __pointer_receiver; using _base_t = STDEXEC::__any::__interface_base<_interface_, Base, _extends_t>; public: - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using _base_t::_base_t; template <__std::derived_from<_interface_> Self, class... Env> @@ -546,7 +546,7 @@ namespace experimental::execution using _base_t = STDEXEC::__any::__interface_base<_interface_, _inject_query_memfn_t, _extends_t>; public: - using scheduler_concept = STDEXEC::scheduler_t; + using scheduler_concept = STDEXEC::scheduler_tag; using _base_t::_base_t; [[nodiscard]] diff --git a/include/exec/asio/completion_token.hpp b/include/exec/asio/completion_token.hpp index 3c7dc3643..f8ad7b2cb 100644 --- a/include/exec/asio/completion_token.hpp +++ b/include/exec/asio/completion_token.hpp @@ -408,7 +408,7 @@ namespace experimental::execution::asio { using args_type_ = std::tuple...>; public: - using sender_concept = ::STDEXEC::sender_t; + using sender_concept = ::STDEXEC::sender_tag; template requires std::constructible_from diff --git a/include/exec/asio/use_sender.hpp b/include/exec/asio/use_sender.hpp index d276f0ac4..760b7b8d4 100644 --- a/include/exec/asio/use_sender.hpp +++ b/include/exec/asio/use_sender.hpp @@ -179,7 +179,7 @@ namespace experimental::execution::asio : s_(static_cast(t)) {} - using sender_concept = ::STDEXEC::sender_t; + using sender_concept = ::STDEXEC::sender_tag; template static consteval completion_signatures< diff --git a/include/exec/async_scope.hpp b/include/exec/async_scope.hpp index 69366455a..0ade14061 100644 --- a/include/exec/async_scope.hpp +++ b/include/exec/async_scope.hpp @@ -110,7 +110,7 @@ namespace experimental::execution template struct __when_empty_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; template using __when_empty_opstate_t = @@ -153,7 +153,7 @@ namespace experimental::execution template struct __nest_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; static void __complete(__impl const * __scope) noexcept { @@ -240,7 +240,7 @@ namespace experimental::execution template struct __nest_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; template <__decays_to<__nest_sender> _Self, receiver _Receiver> requires sender_to<__copy_cvref_t<_Self, _Constrained>, __nest_receiver<_Receiver>> @@ -540,7 +540,7 @@ namespace experimental::execution template struct __future_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; constexpr void __dispatch_result_(std::unique_lock& __guard) noexcept { @@ -659,7 +659,7 @@ namespace experimental::execution using __future_opstate_t = __future_opstate<_Sender, _Env, _Receiver>; public: - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; __future(__future&&) = default; auto operator=(__future&&) -> __future& = default; @@ -747,7 +747,7 @@ namespace experimental::execution template struct __spawn_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; constexpr void set_value() noexcept { diff --git a/include/exec/at_coroutine_exit.hpp b/include/exec/at_coroutine_exit.hpp index 861ed509e..4118079be 100644 --- a/include/exec/at_coroutine_exit.hpp +++ b/include/exec/at_coroutine_exit.hpp @@ -38,7 +38,7 @@ namespace experimental::execution template struct __receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; template requires __callable @@ -71,7 +71,7 @@ namespace experimental::execution template struct __sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; template using __completions_t = __mapply<__mremove>, diff --git a/include/exec/completion_signatures.hpp b/include/exec/completion_signatures.hpp index a692b437e..45cb840f2 100644 --- a/include/exec/completion_signatures.hpp +++ b/include/exec/completion_signatures.hpp @@ -196,7 +196,7 @@ namespace experimental::execution //! template //! struct then_sender //! { - //! using sender_concept = ex::sender_t; + //! using sender_concept = ex::sender_tag; //! //! template //! static consteval auto get_completion_signatures() diff --git a/include/exec/create.hpp b/include/exec/create.hpp index 445ec5312..4eea94321 100644 --- a/include/exec/create.hpp +++ b/include/exec/create.hpp @@ -64,7 +64,7 @@ namespace experimental::execution template struct __sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = STDEXEC::completion_signatures<_Sigs...>; template <__decays_to<__sender> _Self, receiver_of _Receiver> diff --git a/include/exec/detail/shared.hpp b/include/exec/detail/shared.hpp index daf69dc85..378b9dfbf 100644 --- a/include/exec/detail/shared.hpp +++ b/include/exec/detail/shared.hpp @@ -99,7 +99,7 @@ namespace experimental::execution::__shared template struct __receiver { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; template STDEXEC_ATTRIBUTE(always_inline) constexpr void set_value(_As&&... __as) noexcept @@ -509,7 +509,7 @@ namespace experimental::execution::__shared template struct __sndr : __if_c<__same_as<_Tag, split_t>, __empty, __move_only> { - using sender_concept = sender_t; + using sender_concept = sender_tag; using __tag_t = _Tag; constexpr explicit __sndr(_Tag, _CvChild&& __child, _Env __env) diff --git a/include/exec/env.hpp b/include/exec/env.hpp index e6c637dfc..c3281ac8b 100644 --- a/include/exec/env.hpp +++ b/include/exec/env.hpp @@ -160,7 +160,7 @@ namespace experimental::execution template struct __sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; template using __value_t = @@ -219,7 +219,7 @@ namespace experimental::execution template struct __sender { - using sender_concept = sender_t; + using sender_concept = sender_tag; constexpr auto get_env() const noexcept -> __join_env_t<_Attrs const &, env_of_t<_Sender>> { diff --git a/include/exec/fork_join.hpp b/include/exec/fork_join.hpp index 97b79ccf5..735d08d76 100644 --- a/include/exec/fork_join.hpp +++ b/include/exec/fork_join.hpp @@ -93,12 +93,12 @@ namespace experimental::execution template struct _cache_sndr_t { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; template struct _opstate_t { - using operation_state_concept = STDEXEC::operation_state_t; + using operation_state_concept = STDEXEC::operation_state_tag; STDEXEC_ATTRIBUTE(host, device) void start() noexcept { @@ -140,7 +140,7 @@ namespace experimental::execution template struct _opstate_t { - using operation_state_concept = STDEXEC::operation_state_t; + using operation_state_concept = STDEXEC::operation_state_tag; using _env_t = STDEXEC::__fwd_env_t>; using _child_completions_t = STDEXEC::__completion_signatures_of_t; using _domain_t = STDEXEC::__completion_domain_of_t; diff --git a/include/exec/just_from.hpp b/include/exec/just_from.hpp index 7f898091e..9b9e32fe4 100644 --- a/include/exec/just_from.hpp +++ b/include/exec/just_from.hpp @@ -80,7 +80,7 @@ namespace experimental::execution template struct _opstate { - using operation_state_concept = STDEXEC::operation_state_t; + using operation_state_concept = STDEXEC::operation_state_tag; Rcvr _rcvr; Fn _fn; @@ -138,7 +138,7 @@ namespace experimental::execution template struct _sndr_base { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = _completions; STDEXEC_ATTRIBUTE(no_unique_address) JustTag _tag; diff --git a/include/exec/libdispatch_queue.hpp b/include/exec/libdispatch_queue.hpp index 167bb7a02..55d3d582f 100644 --- a/include/exec/libdispatch_queue.hpp +++ b/include/exec/libdispatch_queue.hpp @@ -119,7 +119,7 @@ namespace experimental::execution struct sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = STDEXEC::completion_signatures; @@ -251,7 +251,7 @@ namespace experimental::execution template struct bulk_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; template using with_error_invoke_t = STDEXEC::__if_c< @@ -426,7 +426,7 @@ namespace experimental::execution template struct bulk_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; using shared_state = bulk_shared_state; diff --git a/include/exec/linux/io_uring_context.hpp b/include/exec/linux/io_uring_context.hpp index 089870717..a030081f9 100644 --- a/include/exec/linux/io_uring_context.hpp +++ b/include/exec/linux/io_uring_context.hpp @@ -685,7 +685,7 @@ namespace experimental::execution class __run_sender { public: - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = STDEXEC::completion_signatures; public: - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; __schedule_env __env_; std::chrono::nanoseconds __duration_; diff --git a/include/exec/materialize.hpp b/include/exec/materialize.hpp index f57b089ef..6d9dc215b 100644 --- a/include/exec/materialize.hpp +++ b/include/exec/materialize.hpp @@ -28,7 +28,7 @@ namespace experimental::execution struct __receiver { public: - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; constexpr __receiver(_Receiver&& __upstream) : __upstream_{static_cast<_Receiver&&>(__upstream)} @@ -69,7 +69,7 @@ namespace experimental::execution struct __sender { public: - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; template <__decays_to<_Sender> _Sndr> constexpr explicit __sender(_Sndr&& __sender) @@ -139,7 +139,7 @@ namespace experimental::execution struct __receiver { public: - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; constexpr __receiver(_Receiver&& __upstream) : __upstream_{static_cast<_Receiver&&>(__upstream)} @@ -177,7 +177,7 @@ namespace experimental::execution struct __sender { public: - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; template <__decays_to<_Sender> _Sndr> constexpr explicit __sender(_Sndr&& __sndr) noexcept(__nothrow_decay_copyable<_Sndr>) diff --git a/include/exec/repeat_n.hpp b/include/exec/repeat_n.hpp index 2dab7bc09..9c2c75904 100644 --- a/include/exec/repeat_n.hpp +++ b/include/exec/repeat_n.hpp @@ -65,7 +65,7 @@ namespace experimental::execution template struct __receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; constexpr void set_value() noexcept { diff --git a/include/exec/repeat_until.hpp b/include/exec/repeat_until.hpp index fd124c053..c44b36645 100644 --- a/include/exec/repeat_until.hpp +++ b/include/exec/repeat_until.hpp @@ -65,7 +65,7 @@ namespace experimental::execution template struct __receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; template constexpr void set_value(_Booleans &&...__bools) noexcept diff --git a/include/exec/reschedule.hpp b/include/exec/reschedule.hpp index 401c38b78..51b30d3c6 100644 --- a/include/exec/reschedule.hpp +++ b/include/exec/reschedule.hpp @@ -50,7 +50,7 @@ namespace experimental::execution { struct __sender { - using sender_concept = sender_t; + using sender_concept = sender_tag; template static consteval auto get_completion_signatures() -> __completions<_Env> diff --git a/include/exec/sequence/any_sequence_of.hpp b/include/exec/sequence/any_sequence_of.hpp index e5b7e345c..48f7db961 100644 --- a/include/exec/sequence/any_sequence_of.hpp +++ b/include/exec/sequence/any_sequence_of.hpp @@ -58,7 +58,7 @@ namespace experimental::execution private: using _base_t = STDEXEC::__any::__interface_base<_interface_, _Base, _extends_t>; public: - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; using _base_t::_base_t; virtual constexpr auto set_next(_item_sender _sndr) -> _void_sender @@ -131,7 +131,7 @@ namespace experimental::execution template struct _any_seq_opstate { - using operation_state_concept = STDEXEC::operation_state_t; + using operation_state_concept = STDEXEC::operation_state_tag; template constexpr explicit _any_seq_opstate(_AnySender &&_sndr, _Receiver _rcvr) diff --git a/include/exec/sequence/ignore_all_values.hpp b/include/exec/sequence/ignore_all_values.hpp index ba59258d9..2646b6e4a 100644 --- a/include/exec/sequence/ignore_all_values.hpp +++ b/include/exec/sequence/ignore_all_values.hpp @@ -106,7 +106,7 @@ namespace experimental::execution template struct __item_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; __item_operation_base<_ItemReceiver, _ResultVariant>* __op_; template @@ -170,7 +170,7 @@ namespace experimental::execution template struct __item_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = STDEXEC::completion_signatures; template @@ -206,7 +206,7 @@ namespace experimental::execution template struct __receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; constexpr explicit __receiver(__operation_base<_Receiver, _ResultVariant>* __op) noexcept : __op_{__op} diff --git a/include/exec/sequence/iterate.hpp b/include/exec/sequence/iterate.hpp index 5754d7dd8..6f397600b 100644 --- a/include/exec/sequence/iterate.hpp +++ b/include/exec/sequence/iterate.hpp @@ -77,7 +77,7 @@ namespace experimental::execution template struct __sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = STDEXEC::completion_signatures)>; @@ -94,7 +94,7 @@ namespace experimental::execution template struct __next_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; constexpr void set_value() noexcept { diff --git a/include/exec/sequence/merge.hpp b/include/exec/sequence/merge.hpp index 69263e42c..d34940a02 100644 --- a/include/exec/sequence/merge.hpp +++ b/include/exec/sequence/merge.hpp @@ -42,7 +42,7 @@ namespace experimental::execution template struct __result_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; void set_value() noexcept { diff --git a/include/exec/sequence/merge_each.hpp b/include/exec/sequence/merge_each.hpp index af5c162df..17273523e 100644 --- a/include/exec/sequence/merge_each.hpp +++ b/include/exec/sequence/merge_each.hpp @@ -255,7 +255,7 @@ namespace experimental::execution struct __error_sender { using __operation_base_interface_t = __operation_base_interface<_ErrorStorage>; - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; template using __error_op_t = __error_op<_ErrorReceiver, _ErrorStorage>; @@ -297,7 +297,7 @@ namespace experimental::execution template struct __error_next_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; using __operation_base_interface_t = __operation_base_interface<_ErrorStorage>; @@ -565,7 +565,7 @@ namespace experimental::execution template struct __receive_nested_value { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; using __operation_base_interface_t = __operation_base_interface<_ErrorStorage>; @@ -649,7 +649,7 @@ namespace experimental::execution template struct __nested_value_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using __operation_base_interface_t = __operation_base_interface<_ErrorStorage>; template @@ -764,7 +764,7 @@ namespace experimental::execution template struct __receive_nested_values { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; using __error_storage_t = _OperationBase::__error_storage_t; using __receiver_t = decltype(_OperationBase::__rcvr_); @@ -1017,7 +1017,7 @@ namespace experimental::execution template struct __receive_nested_sequence { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; using __next_op_base_t = __next_operation_base<_NextReceiver, _OperationBase, _NestedSeqOp>; @@ -1104,7 +1104,7 @@ namespace experimental::execution template struct __next_sequence_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; template using __next_sequence_op_t = @@ -1143,7 +1143,7 @@ namespace experimental::execution template struct __receive_nested_sequences { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; template using __next_sequence_sender_t = diff --git a/include/exec/sequence/transform_each.hpp b/include/exec/sequence/transform_each.hpp index 1b04f8172..9f8c9da45 100644 --- a/include/exec/sequence/transform_each.hpp +++ b/include/exec/sequence/transform_each.hpp @@ -62,7 +62,7 @@ namespace experimental::execution template struct __receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; template auto set_next(_Item&& __item) & noexcept( diff --git a/include/exec/sequence_senders.hpp b/include/exec/sequence_senders.hpp index e224a3eb0..47b7e67c3 100644 --- a/include/exec/sequence_senders.hpp +++ b/include/exec/sequence_senders.hpp @@ -42,7 +42,7 @@ STDEXEC_PRAGMA_IGNORE_EDG(not_used_in_template_function_params) " template \n" \ " struct MyOpState\n" \ " {\n" \ - " using operation_state_concept = STDEXEC::operation_state_t;\n" \ + " using operation_state_concept = STDEXEC::operation_state_tag;\n" \ "\n" \ " void start() noexcept\n" \ " {\n" \ @@ -90,7 +90,7 @@ namespace experimental::execution template using _WITH_PRETTY_SEQUENCES_ = _WITH_SEQUENCES_...>; - struct sequence_sender_t : STDEXEC::sender_t + struct sequence_sender_t : STDEXEC::sender_tag {}; using sequence_tag [[deprecated("Renamed to exec::sequence_sender_t")]] = exec::sequence_sender_t; @@ -175,7 +175,7 @@ namespace experimental::execution template struct __stopped_means_break { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; using __token_t = stop_token_of_t>; constexpr void set_value() noexcept @@ -1082,7 +1082,7 @@ namespace experimental::execution : STDEXEC::__debug::__receiver<_CvSequence, _Env, _Sigs...> , __valid_next<_Items...> { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; STDEXEC_ATTRIBUTE(host, device) constexpr auto get_env() const noexcept -> STDEXEC::__debug::__env_t<_Env> diff --git a/include/exec/start_detached.hpp b/include/exec/start_detached.hpp index 871bea31a..a3938c22b 100644 --- a/include/exec/start_detached.hpp +++ b/include/exec/start_detached.hpp @@ -34,7 +34,7 @@ namespace experimental::execution { struct __submit_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; template constexpr void set_value(_As&&...) noexcept @@ -75,7 +75,7 @@ namespace experimental::execution template struct __receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; template constexpr void set_value(_As&&...) noexcept diff --git a/include/exec/start_now.hpp b/include/exec/start_now.hpp index 1df21a154..f5f02e02e 100644 --- a/include/exec/start_now.hpp +++ b/include/exec/start_now.hpp @@ -96,7 +96,7 @@ namespace experimental::execution template struct __receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; template constexpr void set_value(_As&&...) noexcept @@ -152,7 +152,7 @@ namespace experimental::execution template struct __sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using __completions_t = STDEXEC::completion_signatures; diff --git a/include/exec/static_thread_pool.hpp b/include/exec/static_thread_pool.hpp index 7f6dbd341..9143279aa 100644 --- a/include/exec/static_thread_pool.hpp +++ b/include/exec/static_thread_pool.hpp @@ -364,7 +364,7 @@ namespace experimental::execution }; public: - using sender_concept = sender_t; + using sender_concept = sender_tag; template using _opstate_t = _opstate; @@ -1260,7 +1260,7 @@ namespace experimental::execution template struct _static_thread_pool::_bulk_sender { - using sender_concept = sender_t; + using sender_concept = sender_tag; template using _with_error_invoke_t = @@ -1487,7 +1487,7 @@ namespace experimental::execution class Receiver> struct _static_thread_pool::_bulk_receiver { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; using shared_state = _bulk_shared_state; @@ -1649,7 +1649,7 @@ namespace experimental::execution template struct item_sender { - using sender_concept = sender_t; + using sender_concept = sender_tag; using completion_signatures = STDEXEC::completion_signatures)>; @@ -1694,7 +1694,7 @@ namespace experimental::execution template struct next_receiver { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; void set_value() noexcept { diff --git a/include/exec/task.hpp b/include/exec/task.hpp index 1e4a398d8..50fa82416 100644 --- a/include/exec/task.hpp +++ b/include/exec/task.hpp @@ -320,7 +320,7 @@ namespace experimental::execution template struct __just_void { - using sender_concept = sender_t; + using sender_concept = sender_tag; using completion_signatures = STDEXEC::completion_signatures; template @@ -349,7 +349,7 @@ namespace experimental::execution template struct __reschedule_receiver { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; void set_value() noexcept { diff --git a/include/exec/thread_pool_base.hpp b/include/exec/thread_pool_base.hpp index a28e68efa..824a53e55 100644 --- a/include/exec/thread_pool_base.hpp +++ b/include/exec/thread_pool_base.hpp @@ -98,7 +98,7 @@ namespace experimental::execution class sender { public: - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; template static consteval auto get_completion_signatures() noexcept { @@ -269,7 +269,7 @@ namespace experimental::execution template struct bulk_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; using shared_state = bulk_shared_state; @@ -363,7 +363,7 @@ namespace experimental::execution template struct bulk_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; template using _with_error_invoke_t = STDEXEC::__eptr_completion_unless_t; diff --git a/include/exec/trampoline_scheduler.hpp b/include/exec/trampoline_scheduler.hpp index 614ad0c50..250ddaaa5 100644 --- a/include/exec/trampoline_scheduler.hpp +++ b/include/exec/trampoline_scheduler.hpp @@ -219,7 +219,7 @@ namespace experimental::execution struct __sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; constexpr explicit __sender(std::size_t __max_size, std::size_t __max_depth) noexcept : __max_recursion_size_(__max_size) diff --git a/include/exec/unless_stop_requested.hpp b/include/exec/unless_stop_requested.hpp index 1dfb7a942..0ebcc7f1c 100644 --- a/include/exec/unless_stop_requested.hpp +++ b/include/exec/unless_stop_requested.hpp @@ -45,7 +45,7 @@ namespace experimental::execution template struct __opstate { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; using __child_op_t = connect_result_t<_CvChild, __receiver_ref<_Receiver>>; constexpr explicit __opstate(_CvChild&& __child, _Receiver __rcvr) diff --git a/include/exec/variant_sender.hpp b/include/exec/variant_sender.hpp index 1a249b701..7f87de40c 100644 --- a/include/exec/variant_sender.hpp +++ b/include/exec/variant_sender.hpp @@ -74,7 +74,7 @@ namespace experimental::execution STDEXEC::__variant<_Senders...> __sndrs_{STDEXEC::__no_init}; public: - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; constexpr variant_sender() requires std::default_initializable<__nth_t<0>> diff --git a/include/exec/when_any.hpp b/include/exec/when_any.hpp index 3dbc790cd..5389a3e9a 100644 --- a/include/exec/when_any.hpp +++ b/include/exec/when_any.hpp @@ -162,7 +162,7 @@ namespace experimental::execution struct __receiver { public: - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; explicit __receiver(__opstate_base<_Receiver, _ResultVariant>* __op) noexcept : __op_{__op} @@ -249,7 +249,7 @@ namespace experimental::execution using __completions_t = __minvoke<__completions_fn<_Env...>, __copy_cvref_t<_Self, _Senders>...>; public: - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; template <__not_decays_to<__sender>... _CvSenders> explicit __sender(_CvSenders&&... __sndrs) diff --git a/include/exec/windows/windows_thread_pool.hpp b/include/exec/windows/windows_thread_pool.hpp index 630f746e3..2b19050c1 100644 --- a/include/exec/windows/windows_thread_pool.hpp +++ b/include/exec/windows/windows_thread_pool.hpp @@ -176,7 +176,7 @@ namespace experimental::execution::__win32 class windows_thread_pool::_cancellable_schedule_op_base::type { public: - using operation_state_concept = STDEXEC::operation_state_t; + using operation_state_concept = STDEXEC::operation_state_tag; type(type &&) = delete; auto operator=(type &&) -> type & = delete; @@ -483,7 +483,7 @@ namespace experimental::execution::__win32 class windows_thread_pool::schedule_sender { public: - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = STDEXEC::completion_signatures::sender { public: - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = STDEXEC::completion_signatures); - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using _set_error_t = completion_signatures; diff --git a/include/nvexec/stream/common.cuh b/include/nvexec/stream/common.cuh index 618082793..e92bd7789 100644 --- a/include/nvexec/stream/common.cuh +++ b/include/nvexec/stream/common.cuh @@ -320,12 +320,12 @@ namespace nv::execution struct stream_sender_base { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; }; struct stream_receiver_base { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; static constexpr std::size_t memory_allocation_size() noexcept { return 0; @@ -519,7 +519,7 @@ namespace nv::execution template struct stream_enqueue_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; explicit stream_enqueue_receiver(Env const * env, Variant* variant, @@ -655,7 +655,7 @@ namespace nv::execution template struct opstate_base : stream_opstate_base { - using operation_state_concept = STDEXEC::operation_state_t; + using operation_state_concept = STDEXEC::operation_state_tag; using outer_env_t = env_of_t; using env_t = make_stream_env_t; diff --git a/include/nvexec/stream/ensure_started.cuh b/include/nvexec/stream/ensure_started.cuh index 8844020ae..324842cd2 100644 --- a/include/nvexec/stream/ensure_started.cuh +++ b/include/nvexec/stream/ensure_started.cuh @@ -348,7 +348,7 @@ namespace nv::execution::_strm template struct ensure_started_sender : stream_sender_base { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using sh_state_t = _ensure_started::sh_state; template using opstate_t = _ensure_started::opstate; diff --git a/include/nvexec/stream/repeat_n.cuh b/include/nvexec/stream/repeat_n.cuh index 70722397f..f05543801 100644 --- a/include/nvexec/stream/repeat_n.cuh +++ b/include/nvexec/stream/repeat_n.cuh @@ -66,7 +66,7 @@ namespace nv::execution::_strm template struct opstate : _strm::opstate_base { - using operation_state_concept = STDEXEC::operation_state_t; + using operation_state_concept = STDEXEC::operation_state_tag; using scheduler_t = __completion_scheduler_of_t>; using inner_sender_t = STDEXEC::__result_of; @@ -152,7 +152,7 @@ namespace nv::execution::_strm template struct sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; template static consteval auto get_completion_signatures() diff --git a/include/nvexec/stream/schedule_from.cuh b/include/nvexec/stream/schedule_from.cuh index 4cda0dccf..cb979c650 100644 --- a/include/nvexec/stream/schedule_from.cuh +++ b/include/nvexec/stream/schedule_from.cuh @@ -43,7 +43,7 @@ namespace nv::execution struct receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; template void set_value(Args&&... args) noexcept diff --git a/include/nvexec/stream/split.cuh b/include/nvexec/stream/split.cuh index a63be1bc4..7488cbb39 100644 --- a/include/nvexec/stream/split.cuh +++ b/include/nvexec/stream/split.cuh @@ -64,7 +64,7 @@ namespace nv::execution::_strm template struct receiver : stream_receiver_base { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; explicit receiver(SharedState& sh_state_t) noexcept : sh_state_(sh_state_t) @@ -341,7 +341,7 @@ namespace nv::execution::_strm template struct split_sender : stream_sender_base { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using sh_state_t = _split::sh_state; template diff --git a/include/nvexec/stream/start_detached.cuh b/include/nvexec/stream/start_detached.cuh index 937e09f13..735f123e3 100644 --- a/include/nvexec/stream/start_detached.cuh +++ b/include/nvexec/stream/start_detached.cuh @@ -33,7 +33,7 @@ namespace nv::execution::_strm { struct submit_receiver { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; template void set_value(Args&&...) noexcept @@ -122,7 +122,7 @@ namespace nv::execution::_strm template struct opstate { - using operation_state_concept = STDEXEC::operation_state_t; + using operation_state_concept = STDEXEC::operation_state_tag; explicit opstate(connect_t, CvSender&& sndr, Env env) : env_(static_cast(env)) diff --git a/include/nvexec/stream/then.cuh b/include/nvexec/stream/then.cuh index 70010104e..9d8f0171c 100644 --- a/include/nvexec/stream/then.cuh +++ b/include/nvexec/stream/then.cuh @@ -56,7 +56,7 @@ namespace nv::execution::_strm template struct receiver : public stream_receiver_base { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; static constexpr std::size_t memory_allocation_size() noexcept { return MemoryAllocationSize; diff --git a/include/nvexec/stream/upon_error.cuh b/include/nvexec/stream/upon_error.cuh index 0af1b4264..4f0904f1a 100644 --- a/include/nvexec/stream/upon_error.cuh +++ b/include/nvexec/stream/upon_error.cuh @@ -55,7 +55,7 @@ namespace nv::execution::_strm template struct receiver : stream_receiver_base { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; using env_t = _strm::opstate_base::env_t; static constexpr std::size_t memory_allocation_size() noexcept diff --git a/include/nvexec/stream/upon_stopped.cuh b/include/nvexec/stream/upon_stopped.cuh index 202e15df6..f18e4a120 100644 --- a/include/nvexec/stream/upon_stopped.cuh +++ b/include/nvexec/stream/upon_stopped.cuh @@ -53,7 +53,7 @@ namespace nv::execution::_strm template struct receiver : public stream_receiver_base { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; using _result_t = std::invoke_result_t; using _env_t = _strm::opstate_base::env_t; @@ -130,7 +130,7 @@ namespace nv::execution::_strm template struct upon_stopped_sender : stream_sender_base { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using _set_error_t = completion_signatures; template diff --git a/include/nvexec/stream/when_all.cuh b/include/nvexec/stream/when_all.cuh index c76c5a22b..a367a9653 100644 --- a/include/nvexec/stream/when_all.cuh +++ b/include/nvexec/stream/when_all.cuh @@ -205,7 +205,7 @@ namespace nv::execution::_strm template struct receiver : stream_receiver_base { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; using when_all_sender_t = __copy_cvref_t; using receiver_t = __decay_t; using sender_t = __m_at_c; diff --git a/include/stdexec/__detail/__any.hpp b/include/stdexec/__detail/__any.hpp index 5fc3aa6b0..6600a5a43 100644 --- a/include/stdexec/__detail/__any.hpp +++ b/include/stdexec/__detail/__any.hpp @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/include/stdexec/__detail/__as_awaitable.hpp b/include/stdexec/__detail/__as_awaitable.hpp index d5d07d7ae..c209ff8db 100644 --- a/include/stdexec/__detail/__as_awaitable.hpp +++ b/include/stdexec/__detail/__as_awaitable.hpp @@ -142,7 +142,7 @@ namespace STDEXEC template struct __receiver_base { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; template void set_value(_Us&&... __us) noexcept diff --git a/include/stdexec/__detail/__basic_sender.hpp b/include/stdexec/__detail/__basic_sender.hpp index 6f5d19b5d..5a2de96a9 100644 --- a/include/stdexec/__detail/__basic_sender.hpp +++ b/include/stdexec/__detail/__basic_sender.hpp @@ -231,7 +231,7 @@ namespace STDEXEC template struct __rcvr { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; using __index_t = __msize_t<_Idx>; template @@ -322,7 +322,7 @@ namespace STDEXEC { struct type { - using sender_concept = sender_t; + using sender_concept = sender_tag; }; }; @@ -335,7 +335,7 @@ namespace STDEXEC template struct __sexpr : __minvoke> { - using sender_concept = sender_t; + using sender_concept = sender_tag; using __desc_t = decltype(_DescriptorFn()); using __tag_t = __desc_t::__tag; diff --git a/include/stdexec/__detail/__continues_on.hpp b/include/stdexec/__detail/__continues_on.hpp index 9132560f9..b87c400f8 100644 --- a/include/stdexec/__detail/__continues_on.hpp +++ b/include/stdexec/__detail/__continues_on.hpp @@ -107,7 +107,7 @@ namespace STDEXEC template struct __receiver2 { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; constexpr void set_value() noexcept { diff --git a/include/stdexec/__detail/__counting_scopes.hpp b/include/stdexec/__detail/__counting_scopes.hpp index 07fbcdf4a..7d3f18ba4 100644 --- a/include/stdexec/__detail/__counting_scopes.hpp +++ b/include/stdexec/__detail/__counting_scopes.hpp @@ -116,7 +116,7 @@ namespace STDEXEC { struct __rcvr_t { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; _Rcvr& __rcvr_; diff --git a/include/stdexec/__detail/__debug.hpp b/include/stdexec/__detail/__debug.hpp index 45404b36a..0329f22c0 100644 --- a/include/stdexec/__detail/__debug.hpp +++ b/include/stdexec/__detail/__debug.hpp @@ -69,7 +69,7 @@ namespace STDEXEC template struct __receiver { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; template STDEXEC_ATTRIBUTE(host, device) diff --git a/include/stdexec/__detail/__diagnostics.hpp b/include/stdexec/__detail/__diagnostics.hpp index 5a744f2a9..52e608aac 100644 --- a/include/stdexec/__detail/__diagnostics.hpp +++ b/include/stdexec/__detail/__diagnostics.hpp @@ -24,8 +24,8 @@ namespace STDEXEC { - struct sender_t; - struct scheduler_t; + struct sender_tag; + struct scheduler_tag; struct _WHAT_ {}; @@ -287,7 +287,7 @@ namespace STDEXEC template struct __not_a_sender { - using sender_concept = sender_t; + using sender_concept = sender_tag; template static consteval auto get_completion_signatures() @@ -299,7 +299,7 @@ namespace STDEXEC template struct __not_a_scheduler { - using scheduler_concept = scheduler_t; + using scheduler_concept = scheduler_tag; constexpr auto schedule() noexcept { @@ -316,13 +316,13 @@ namespace STDEXEC "\n" \ "The given type is not a sender because STDEXEC::enable_sender is false. Either:\n" \ "\n" \ - "1. Give the type a nested '::sender_concept' type that is an alias for 'STDEXEC::sender_t',\n" \ + "1. Give the type a nested '::sender_concept' type that is an alias for 'STDEXEC::sender_tag',\n"\ " as in:\n" \ "\n" \ " class MySender\n" \ " {\n" \ " public:\n" \ - " using sender_concept = STDEXEC::sender_t;\n" \ + " using sender_concept = STDEXEC::sender_tag;\n" \ " ...\n" \ " };\n" \ "\n" \ @@ -354,7 +354,7 @@ namespace STDEXEC " class MySender\n" \ " {\n" \ " public:\n" \ - " using sender_concept = STDEXEC::sender_t;\n" \ + " using sender_concept = STDEXEC::sender_tag;\n" \ " using completion_signatures = STDEXEC::completion_signatures<\n" \ " // This sender can complete successfully with an int and a float...\n" \ " STDEXEC::set_value_t(int, float),\n" \ @@ -371,7 +371,7 @@ namespace STDEXEC " class MySender\n" \ " {\n" \ " public:\n" \ - " using sender_concept = STDEXEC::sender_t;\n" \ + " using sender_concept = STDEXEC::sender_tag;\n" \ "\n" \ " template \n" \ " static consteval auto get_completion_signatures() -> STDEXEC::completion_signatures<\n" \ @@ -404,7 +404,7 @@ namespace STDEXEC " class MySender\n" \ " {\n" \ " public:\n" \ - " using sender_concept = STDEXEC::sender_t;\n" \ + " using sender_concept = STDEXEC::sender_tag;\n" \ "\n" \ " template \n" \ " static consteval auto get_completion_signatures() -> STDEXEC::completion_signatures<\n" \ @@ -428,13 +428,13 @@ namespace STDEXEC " class MySender\n" \ " {\n" \ " public:\n" \ - " using sender_concept = STDEXEC::sender_t;\n" \ + " using sender_concept = STDEXEC::sender_tag;\n" \ " using completion_signatures = STDEXEC::completion_signatures;\n" \ "\n" \ " template \n" \ " struct MyOpState\n" \ " {\n" \ - " using operation_state_concept = STDEXEC::operation_state_t;\n" \ + " using operation_state_concept = STDEXEC::operation_state_tag;\n" \ "\n" \ " void start() noexcept\n" \ " {\n" \ diff --git a/include/stdexec/__detail/__execution_fwd.hpp b/include/stdexec/__detail/__execution_fwd.hpp index 2b0ecd517..67689e6fc 100644 --- a/include/stdexec/__detail/__execution_fwd.hpp +++ b/include/stdexec/__detail/__execution_fwd.hpp @@ -145,10 +145,16 @@ namespace STDEXEC ////////////////////////////////////////////////////////////////////////////////////////////////// // concept tag types: - struct sender_t; - struct operation_state_t; - struct scheduler_t; - struct receiver_t; + struct sender_tag; + struct operation_state_tag; + struct scheduler_tag; + struct receiver_tag; + + // concept tag aliases for backwards compatibility: + using sender_t = sender_tag; + using operation_state_t = operation_state_tag; + using scheduler_t = scheduler_tag; + using receiver_t = receiver_tag; template STDEXEC_ATTRIBUTE(nodiscard, always_inline, host, device) diff --git a/include/stdexec/__detail/__finally.hpp b/include/stdexec/__detail/__finally.hpp index 0a7343a80..45d06d572 100644 --- a/include/stdexec/__detail/__finally.hpp +++ b/include/stdexec/__detail/__finally.hpp @@ -136,7 +136,7 @@ namespace STDEXEC template struct __final_receiver { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; using __env_t = __final_env_t<_Env2, env_of_t<_Receiver>>; constexpr void set_value() noexcept @@ -271,7 +271,7 @@ namespace STDEXEC template struct __initial_receiver { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; template constexpr void set_value(_As&&... __as) noexcept @@ -363,7 +363,7 @@ namespace STDEXEC template struct __sender { - using sender_concept = sender_t; + using sender_concept = sender_tag; template using __opstate_t = __opstate<__copy_cvref_t<_Self, _InitialSender>, diff --git a/include/stdexec/__detail/__inline_scheduler.hpp b/include/stdexec/__detail/__inline_scheduler.hpp index 2a4bf8817..b72695204 100644 --- a/include/stdexec/__detail/__inline_scheduler.hpp +++ b/include/stdexec/__detail/__inline_scheduler.hpp @@ -39,7 +39,7 @@ namespace STDEXEC template struct __opstate { - using operation_state_concept = operation_state_t; + using operation_state_concept = operation_state_tag; STDEXEC_ATTRIBUTE(host, device) constexpr void start() noexcept @@ -52,7 +52,7 @@ namespace STDEXEC struct __sender { - using sender_concept = sender_t; + using sender_concept = sender_tag; using completion_signatures = STDEXEC::completion_signatures; template @@ -70,7 +70,7 @@ namespace STDEXEC }; public: - using scheduler_concept = scheduler_t; + using scheduler_concept = scheduler_tag; constexpr inline_scheduler() = default; diff --git a/include/stdexec/__detail/__let.hpp b/include/stdexec/__detail/__let.hpp index f8aa70917..78e237a32 100644 --- a/include/stdexec/__detail/__let.hpp +++ b/include/stdexec/__detail/__let.hpp @@ -73,7 +73,7 @@ namespace STDEXEC template struct __rcvr_env { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; template constexpr void set_value(_As&&... __as) noexcept { @@ -320,7 +320,7 @@ namespace STDEXEC template struct __first_rcvr { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; template constexpr void set_value(_Args&&... __args) noexcept { diff --git a/include/stdexec/__detail/__operation_states.hpp b/include/stdexec/__detail/__operation_states.hpp index ff71fd4bc..f43930409 100644 --- a/include/stdexec/__detail/__operation_states.hpp +++ b/include/stdexec/__detail/__operation_states.hpp @@ -26,7 +26,7 @@ namespace STDEXEC { // operation state tag type - struct operation_state_t + struct operation_state_tag {}; ///////////////////////////////////////////////////////////////////////////// diff --git a/include/stdexec/__detail/__parallel_scheduler.hpp b/include/stdexec/__detail/__parallel_scheduler.hpp index b5ff340b4..3d1cf823f 100644 --- a/include/stdexec/__detail/__parallel_scheduler.hpp +++ b/include/stdexec/__detail/__parallel_scheduler.hpp @@ -204,7 +204,7 @@ namespace STDEXEC { public: /// Marks this type as being a sender - using sender_concept = sender_t; + using sender_concept = sender_tag; /// Implementation __detail. Constructs the sender to wrap `__impl`. explicit __parallel_sender(__detail::__backend_ptr_t __impl) @@ -462,7 +462,7 @@ namespace STDEXEC struct __bulk_intermediate_receiver { /// Declare that this is a `receiver`. - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; /// Object that holds the relevant data for the entire bulk operation. _BulkState& __state_; @@ -617,7 +617,7 @@ namespace STDEXEC public: /// Marks this type as being a sender - using sender_concept = sender_t; + using sender_concept = sender_tag; /// Constructs `this`. __parallel_bulk_sender(parallel_scheduler __sched, diff --git a/include/stdexec/__detail/__parallel_scheduler_backend.hpp b/include/stdexec/__detail/__parallel_scheduler_backend.hpp index 928771854..91a502d73 100644 --- a/include/stdexec/__detail/__parallel_scheduler_backend.hpp +++ b/include/stdexec/__detail/__parallel_scheduler_backend.hpp @@ -188,7 +188,7 @@ namespace STDEXEC , __stop_callback_for>> { public: - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; using __stop_token_t = stop_token_of_t>; using __allocator_t = std::allocator_traits< __call_result_or_t struct __proxy_receiver { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; using __delete_fn_t = void(void*) noexcept; constexpr void set_value() noexcept diff --git a/include/stdexec/__detail/__receiver_adaptor.hpp b/include/stdexec/__detail/__receiver_adaptor.hpp index 574ae8e6b..52c92d48d 100644 --- a/include/stdexec/__detail/__receiver_adaptor.hpp +++ b/include/stdexec/__detail/__receiver_adaptor.hpp @@ -32,7 +32,7 @@ namespace STDEXEC struct __receiver : __nope { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; constexpr void set_error(std::exception_ptr) noexcept; constexpr void set_stopped() noexcept; @@ -110,7 +110,7 @@ namespace STDEXEC template <__class _Derived, class _Base = __adaptors::__not_a_receiver> struct __receiver_adaptor : __adaptors::__adaptor_base<_Base> - , receiver_t + , receiver_tag { static constexpr bool __has_base = !__std::derived_from<_Base, __adaptors::__no::__nope>; @@ -138,7 +138,7 @@ namespace STDEXEC } public: - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; constexpr __receiver_adaptor() = default; using __adaptors::__adaptor_base<_Base>::__adaptor_base; diff --git a/include/stdexec/__detail/__receiver_ref.hpp b/include/stdexec/__detail/__receiver_ref.hpp index 8fe5a8a7c..144a7204f 100644 --- a/include/stdexec/__detail/__receiver_ref.hpp +++ b/include/stdexec/__detail/__receiver_ref.hpp @@ -42,7 +42,7 @@ namespace STDEXEC _RcvrPtr __rcvr_ptr_; public: - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; STDEXEC_ATTRIBUTE(host, device) constexpr explicit __pointer_receiver(_RcvrPtr __rcvr_ptr) noexcept diff --git a/include/stdexec/__detail/__receivers.hpp b/include/stdexec/__detail/__receivers.hpp index 167021c6c..d67dd8ff5 100644 --- a/include/stdexec/__detail/__receivers.hpp +++ b/include/stdexec/__detail/__receivers.hpp @@ -165,9 +165,9 @@ namespace STDEXEC inline constexpr set_error_t set_error{}; inline constexpr set_stopped_t set_stopped{}; - struct receiver_t + struct receiver_tag { - using receiver_concept = receiver_t; // NOT TO SPEC + using receiver_concept = receiver_tag; // NOT TO SPEC }; namespace __detail @@ -177,7 +177,7 @@ namespace STDEXEC STDEXEC_EDG(), requires { typename _Receiver::receiver_concept; - } &&) __std::derived_from); + } &&) __std::derived_from); } // namespace __detail template @@ -255,7 +255,7 @@ namespace STDEXEC // a receiver with an arbitrary environment. struct __receiver_archetype_base { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; template STDEXEC_ATTRIBUTE(host, device) diff --git a/include/stdexec/__detail/__run_loop.hpp b/include/stdexec/__detail/__run_loop.hpp index 5da413a6d..3a4901eda 100644 --- a/include/stdexec/__detail/__run_loop.hpp +++ b/include/stdexec/__detail/__run_loop.hpp @@ -240,11 +240,11 @@ namespace STDEXEC {} public: - using scheduler_concept = scheduler_t; + using scheduler_concept = scheduler_tag; struct __sndr_t { - using sender_concept = sender_t; + using sender_concept = sender_tag; template STDEXEC_ATTRIBUTE(nodiscard, host, device) diff --git a/include/stdexec/__detail/__schedulers.hpp b/include/stdexec/__detail/__schedulers.hpp index 10d153229..9e6d5b9c6 100644 --- a/include/stdexec/__detail/__schedulers.hpp +++ b/include/stdexec/__detail/__schedulers.hpp @@ -31,7 +31,7 @@ namespace STDEXEC { // scheduler concept opt-in tag - struct scheduler_t + struct scheduler_tag {}; ///////////////////////////////////////////////////////////////////////////// diff --git a/include/stdexec/__detail/__scope_concepts.hpp b/include/stdexec/__detail/__scope_concepts.hpp index c6c69f07a..695342221 100644 --- a/include/stdexec/__detail/__scope_concepts.hpp +++ b/include/stdexec/__detail/__scope_concepts.hpp @@ -43,7 +43,7 @@ namespace STDEXEC { struct __test_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = STDEXEC::completion_signatures - concept __enable_sender = __std::derived_from + concept __enable_sender = __std::derived_from || __awaitable<_Sender, __detail::__promise>>; } // namespace __detail diff --git a/include/stdexec/__detail/__sequence.hpp b/include/stdexec/__detail/__sequence.hpp index 93bc961d8..ff9c37a5e 100644 --- a/include/stdexec/__detail/__sequence.hpp +++ b/include/stdexec/__detail/__sequence.hpp @@ -197,7 +197,7 @@ namespace STDEXEC template struct __rcvr2 { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; using __env_t = __join_env_t<_Env2 const &, __fwd_env_t>>; template @@ -236,7 +236,7 @@ namespace STDEXEC template struct __rcvr1 { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; constexpr void set_value() noexcept { @@ -349,7 +349,7 @@ namespace STDEXEC template struct __sndr<_Sender1, _Sender2> { - using sender_concept = sender_t; + using sender_concept = sender_tag; template using __opstate_t = __opstate<__copy_cvref_t<_Self, _Sender1>, _Sender2, _Receiver>; diff --git a/include/stdexec/__detail/__spawn.hpp b/include/stdexec/__detail/__spawn.hpp index b83e20539..2177826ec 100644 --- a/include/stdexec/__detail/__spawn.hpp +++ b/include/stdexec/__detail/__spawn.hpp @@ -59,7 +59,7 @@ namespace STDEXEC struct __spawn_receiver { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; __spawn_state_base* __state_; diff --git a/include/stdexec/__detail/__spawn_future.hpp b/include/stdexec/__detail/__spawn_future.hpp index a691c6fd2..6fc8761c0 100644 --- a/include/stdexec/__detail/__spawn_future.hpp +++ b/include/stdexec/__detail/__spawn_future.hpp @@ -189,7 +189,7 @@ namespace STDEXEC template struct __spawn_future_receiver { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; __spawn_future_state_base<_Completions>* __state_; @@ -743,7 +743,7 @@ namespace STDEXEC private: struct __receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; template void set_value(_Ts&&... __ts) && noexcept diff --git a/include/stdexec/__detail/__sync_wait.hpp b/include/stdexec/__detail/__sync_wait.hpp index 0c28bdb7b..0dc531a8c 100644 --- a/include/stdexec/__detail/__sync_wait.hpp +++ b/include/stdexec/__detail/__sync_wait.hpp @@ -86,7 +86,7 @@ namespace STDEXEC::__sync_wait template struct __receiver { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; template constexpr void set_value(_As&&... __as) noexcept diff --git a/include/stdexec/__detail/__task.hpp b/include/stdexec/__detail/__task.hpp index 0a1890745..0649304ab 100644 --- a/include/stdexec/__detail/__task.hpp +++ b/include/stdexec/__detail/__task.hpp @@ -211,7 +211,7 @@ namespace STDEXEC template using __own_env_t = __minvoke_or_q<__task::__environment_type, env<>, _Env, _EnvProvider>; public: - using sender_concept = sender_t; + using sender_concept = sender_tag; using promise_type = __promise; using allocator_type = @@ -516,7 +516,7 @@ namespace STDEXEC , __stop_callback_box_t<_Rcvr> { public: - using operation_state_concept = operation_state_t; + using operation_state_concept = operation_state_tag; explicit __opstate(task&& __task, _Rcvr&& __rcvr) noexcept : __opstate_base(static_cast(__task), __rcvr) diff --git a/include/stdexec/__detail/__task_scheduler.hpp b/include/stdexec/__detail/__task_scheduler.hpp index 64bd8a2f6..d20e8f673 100644 --- a/include/stdexec/__detail/__task_scheduler.hpp +++ b/include/stdexec/__detail/__task_scheduler.hpp @@ -147,7 +147,7 @@ namespace STDEXEC }; public: - using sender_concept = sender_t; + using sender_concept = sender_tag; template [[nodiscard]] @@ -225,7 +225,7 @@ namespace STDEXEC class __backend_for; public: - using scheduler_concept = scheduler_t; + using scheduler_concept = scheduler_tag; template <__not_same_as _Sch, class _Alloc = std::allocator<_Sch>> requires __infallible_scheduler<_Sch, __task::__env_t> @@ -289,7 +289,7 @@ namespace STDEXEC class __any_opstate { public: - using operation_state_concept = operation_state_t; + using operation_state_concept = operation_state_tag; constexpr explicit __any_opstate(__any_task_scheduler_backend __backend, _Rcvr __rcvr) noexcept @@ -312,7 +312,7 @@ namespace STDEXEC //! @brief A type-erased sender returned by task_scheduler::schedule(). struct __sender { - using sender_concept = sender_t; + using sender_concept = sender_tag; constexpr explicit __sender(task_scheduler __sch) noexcept : __attrs_{std::move(__sch)} @@ -356,7 +356,7 @@ namespace STDEXEC template struct __bulk_receiver { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; template constexpr void set_value(_As&&... __as) noexcept @@ -566,7 +566,7 @@ namespace STDEXEC template struct __bulk_opstate { - using operation_state_concept = operation_state_t; + using operation_state_concept = operation_state_tag; constexpr explicit __bulk_opstate(_Sndr&& __sndr, size_t __shape, @@ -597,7 +597,7 @@ namespace STDEXEC template struct __bulk_sender { - using sender_concept = sender_t; + using sender_concept = sender_tag; constexpr explicit __bulk_sender(_Sndr __sndr, task_scheduler __sch) : __sndr_(std::move(__sndr)) diff --git a/include/stdexec/__detail/__transform_completion_signatures.hpp b/include/stdexec/__detail/__transform_completion_signatures.hpp index b1b288894..a61b441ff 100644 --- a/include/stdexec/__detail/__transform_completion_signatures.hpp +++ b/include/stdexec/__detail/__transform_completion_signatures.hpp @@ -546,7 +546,7 @@ namespace STDEXEC //! template //! struct then_sender //! { - //! using sender_concept = ex::sender_t; + //! using sender_concept = ex::sender_tag; //! //! template //! static consteval auto get_completion_signatures() diff --git a/test/exec/asio/test_completion_token.cpp b/test/exec/asio/test_completion_token.cpp index f43eb4426..9d0b784fb 100644 --- a/test/exec/asio/test_completion_token.cpp +++ b/test/exec/asio/test_completion_token.cpp @@ -70,7 +70,7 @@ namespace ptr_.reset(); } public: - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; template requires std::constructible_from @@ -698,7 +698,7 @@ namespace struct value_category_receiver { - using receiver_concept = receiver_t; + using receiver_concept = receiver_tag; void set_value(std::mutex&&) && noexcept { diff --git a/test/exec/async_scope/test_spawn.cpp b/test/exec/async_scope/test_spawn.cpp index 5489b81ec..672e682a1 100644 --- a/test/exec/async_scope/test_spawn.cpp +++ b/test/exec/async_scope/test_spawn.cpp @@ -14,7 +14,7 @@ namespace //! Sender that throws exception when connected struct throwing_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; template diff --git a/test/exec/async_scope/test_spawn_future.cpp b/test/exec/async_scope/test_spawn_future.cpp index 001f924aa..78fecef21 100644 --- a/test/exec/async_scope/test_spawn_future.cpp +++ b/test/exec/async_scope/test_spawn_future.cpp @@ -34,7 +34,7 @@ namespace //! Sender that throws exception when connected struct throwing_sender { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; using completion_signatures = ex::completion_signatures; template diff --git a/test/exec/sequence/test_any_sequence_of.cpp b/test/exec/sequence/test_any_sequence_of.cpp index d33edb432..91275194c 100644 --- a/test/exec/sequence/test_any_sequence_of.cpp +++ b/test/exec/sequence/test_any_sequence_of.cpp @@ -28,7 +28,7 @@ namespace template struct ignore_all_item_rcvr { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; Receiver rcvr; [[nodiscard]] @@ -58,7 +58,7 @@ namespace template struct ignore_all_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = STDEXEC::completion_signatures; Item item_; @@ -75,7 +75,7 @@ namespace struct ignore_all_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; template auto set_next(Item&& item) noexcept -> ignore_all_sender> diff --git a/test/exec/sequence/test_empty_sequence.cpp b/test/exec/sequence/test_empty_sequence.cpp index 44c14bba1..f3826519a 100644 --- a/test/exec/sequence/test_empty_sequence.cpp +++ b/test/exec/sequence/test_empty_sequence.cpp @@ -40,7 +40,7 @@ namespace struct count_set_next_receiver_t { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; int& count_invocations_; auto set_next(auto /* item */) & noexcept diff --git a/test/exec/sequence/test_iterate.cpp b/test/exec/sequence/test_iterate.cpp index f34dae26c..234e3946d 100644 --- a/test/exec/sequence/test_iterate.cpp +++ b/test/exec/sequence/test_iterate.cpp @@ -30,7 +30,7 @@ namespace template struct sum_item_rcvr { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; Receiver rcvr; int* sum_; @@ -62,7 +62,7 @@ namespace template struct sum_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = STDEXEC::completion_signatures; Item item_; @@ -81,7 +81,7 @@ namespace template > struct sum_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; int& sum_; Env env_{}; diff --git a/test/exec/sequence/test_merge.cpp b/test/exec/sequence/test_merge.cpp index 8792d7320..667d1d899 100644 --- a/test/exec/sequence/test_merge.cpp +++ b/test/exec/sequence/test_merge.cpp @@ -45,7 +45,7 @@ namespace struct null_receiver { - using receiver_concept = ex::receiver_t; + using receiver_concept = ex::receiver_tag; void set_value() noexcept {} diff --git a/test/exec/sequence/test_merge_each.cpp b/test/exec/sequence/test_merge_each.cpp index 44cbc39ed..9b2f87582 100644 --- a/test/exec/sequence/test_merge_each.cpp +++ b/test/exec/sequence/test_merge_each.cpp @@ -48,7 +48,7 @@ namespace struct null_receiver { - using receiver_concept = ex::receiver_t; + using receiver_concept = ex::receiver_tag; template void set_value(_Values&&...) noexcept diff --git a/test/exec/sequence/test_merge_each_threaded.cpp b/test/exec/sequence/test_merge_each_threaded.cpp index be365bb6b..e0ccfea7d 100644 --- a/test/exec/sequence/test_merge_each_threaded.cpp +++ b/test/exec/sequence/test_merge_each_threaded.cpp @@ -50,7 +50,7 @@ namespace struct null_receiver { - using receiver_concept = ex::receiver_t; + using receiver_concept = ex::receiver_tag; template void set_value(_Values&&...) noexcept diff --git a/test/exec/sequence/test_transform_each.cpp b/test/exec/sequence/test_transform_each.cpp index 4708bc077..c6aea2f21 100644 --- a/test/exec/sequence/test_transform_each.cpp +++ b/test/exec/sequence/test_transform_each.cpp @@ -33,7 +33,7 @@ namespace struct next_rcvr { - using receiver_concept = ex::receiver_t; + using receiver_concept = ex::receiver_tag; auto set_next(auto item) { diff --git a/test/exec/test_any_sender.cpp b/test/exec/test_any_sender.cpp index 1dc8a78c9..5f2eb5fce 100644 --- a/test/exec/test_any_sender.cpp +++ b/test/exec/test_any_sender.cpp @@ -65,7 +65,7 @@ namespace struct sink_receiver { - using receiver_concept = ex::receiver_t; + using receiver_concept = ex::receiver_tag; std::variant value_{}; @@ -340,7 +340,7 @@ namespace template struct stopped_receiver_base { - using receiver_concept = ex::receiver_t; + using receiver_concept = ex::receiver_tag; Token stop_token_{}; }; @@ -679,7 +679,7 @@ namespace struct sender { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; using completion_signatures = ex::completion_signatures; template @@ -760,7 +760,7 @@ namespace template struct sink> { - using receiver_concept = ex::receiver_t; + using receiver_concept = ex::receiver_tag; template void set_value(_Args &&...__args) noexcept diff --git a/test/exec/test_ensure_started.cpp b/test/exec/test_ensure_started.cpp index 9ecf853ab..e5756362a 100644 --- a/test/exec/test_ensure_started.cpp +++ b/test/exec/test_ensure_started.cpp @@ -346,7 +346,7 @@ namespace struct my_sender { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; using is_sender = void; using completion_signatures = ex::completion_signatures_of_t; diff --git a/test/exec/test_repeat_until.cpp b/test/exec/test_repeat_until.cpp index c8b07ded1..2d02aab38 100644 --- a/test/exec/test_repeat_until.cpp +++ b/test/exec/test_repeat_until.cpp @@ -42,7 +42,7 @@ namespace struct boolean_sender { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; using completion_signatures = ex::completion_signatures; @@ -271,7 +271,7 @@ namespace }; struct receiver { - using receiver_concept = ::STDEXEC::receiver_t; + using receiver_concept = ::STDEXEC::receiver_tag; void set_value() && noexcept { FAIL_CHECK("Unexpected value completion signal"); @@ -382,7 +382,7 @@ namespace }; struct receiver { - using receiver_concept = ::STDEXEC::receiver_t; + using receiver_concept = ::STDEXEC::receiver_tag; void set_value() && noexcept { done_ = true; diff --git a/test/exec/test_sequence_senders.cpp b/test/exec/test_sequence_senders.cpp index 5a516e442..14a32de77 100644 --- a/test/exec/test_sequence_senders.cpp +++ b/test/exec/test_sequence_senders.cpp @@ -38,7 +38,7 @@ namespace template <__completion_signature... _Sigs> struct some_sender_of { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = STDEXEC::completion_signatures<_Sigs...>; template @@ -61,7 +61,7 @@ namespace template <__completion_signature... _Sigs> struct test_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; template requires __one_of @@ -100,7 +100,7 @@ namespace template <__completion_signature... _Sigs> struct next_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; template > _Item> auto set_next(_Item&& __item) & noexcept -> _Item diff --git a/test/exec/test_split.cpp b/test/exec/test_split.cpp index e7df84a88..f4f15b75f 100644 --- a/test/exec/test_split.cpp +++ b/test/exec/test_split.cpp @@ -553,7 +553,7 @@ namespace struct my_sender { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; using is_sender = void; using completion_signatures = ex::completion_signatures_of_t; diff --git a/test/exec/test_start_detached.cpp b/test/exec/test_start_detached.cpp index aa0cec89e..c1db7ffe0 100644 --- a/test/exec/test_start_detached.cpp +++ b/test/exec/test_start_detached.cpp @@ -101,7 +101,7 @@ namespace struct custom_sender { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; using completion_signatures = ex::completion_signatures; bool* called; @@ -138,7 +138,7 @@ namespace { struct sender { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; using completion_signatures = ex::completion_signatures; [[nodiscard]] diff --git a/test/exec/test_trampoline_scheduler.cpp b/test/exec/test_trampoline_scheduler.cpp index 3cd3cb4ec..40d3491f0 100644 --- a/test/exec/test_trampoline_scheduler.cpp +++ b/test/exec/test_trampoline_scheduler.cpp @@ -31,7 +31,7 @@ namespace struct fails_alot { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; using completion_signatures = ex::completion_signatures; diff --git a/test/exec/test_when_any.cpp b/test/exec/test_when_any.cpp index 6dcb2d3ee..ac1618b08 100644 --- a/test/exec/test_when_any.cpp +++ b/test/exec/test_when_any.cpp @@ -202,7 +202,7 @@ namespace struct dup_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = STDEXEC::completion_signatures; diff --git a/test/nvexec/common.cuh b/test/nvexec/common.cuh index 742c1503f..bec6028c9 100644 --- a/test/nvexec/common.cuh +++ b/test/nvexec/common.cuh @@ -128,7 +128,7 @@ namespace Fun fun_; public: - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; explicit receiver(Receiver rcvr, Fun fun) : exec::receiver_adaptor(static_cast(rcvr)) @@ -157,7 +157,7 @@ namespace template struct sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; template using op_t = operation_state, receiver>; @@ -221,7 +221,7 @@ namespace template struct sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; Sender sndr_; diff --git a/test/stdexec/algos/adaptors/test_bulk.cpp b/test/stdexec/algos/adaptors/test_bulk.cpp index 58005c2a3..b3055205d 100644 --- a/test/stdexec/algos/adaptors/test_bulk.cpp +++ b/test/stdexec/algos/adaptors/test_bulk.cpp @@ -75,7 +75,7 @@ namespace { struct receiver { - using receiver_concept = ex::receiver_t; + using receiver_concept = ex::receiver_tag; constexpr void set_value(int const j) && noexcept { i = j; diff --git a/test/stdexec/algos/adaptors/test_let_value.cpp b/test/stdexec/algos/adaptors/test_let_value.cpp index 5d2f99900..b56880030 100644 --- a/test/stdexec/algos/adaptors/test_let_value.cpp +++ b/test/stdexec/algos/adaptors/test_let_value.cpp @@ -389,7 +389,7 @@ namespace struct bad_receiver { - using receiver_concept = ex::receiver_t; + using receiver_concept = ex::receiver_tag; bad_receiver(bool& completed) noexcept : completed_{completed} @@ -416,7 +416,7 @@ namespace struct throws_on_connect { - using sender_concept = ::STDEXEC::sender_t; + using sender_concept = ::STDEXEC::sender_tag; template static consteval auto get_completion_signatures() noexcept @@ -439,7 +439,7 @@ namespace { struct receiver { - using receiver_concept = ::STDEXEC::receiver_t; + using receiver_concept = ::STDEXEC::receiver_tag; std::shared_ptr ptr; void set_value() noexcept { @@ -481,7 +481,7 @@ namespace struct immovable_sender { - using sender_concept = ::STDEXEC::sender_t; + using sender_concept = ::STDEXEC::sender_tag; template static consteval auto get_completion_signatures() noexcept diff --git a/test/stdexec/algos/adaptors/test_on3.cpp b/test/stdexec/algos/adaptors/test_on3.cpp index 616656c01..22562c787 100644 --- a/test/stdexec/algos/adaptors/test_on3.cpp +++ b/test/stdexec/algos/adaptors/test_on3.cpp @@ -30,7 +30,7 @@ namespace template struct get_env_rcvr { - using receiver_concept = ex::receiver_t; + using receiver_concept = ex::receiver_tag; Rcvr rcvr; template @@ -61,7 +61,7 @@ namespace template struct get_env_sender { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; Sndr sndr; template Self, ex::receiver Rcvr> diff --git a/test/stdexec/algos/adaptors/test_sequence.cpp b/test/stdexec/algos/adaptors/test_sequence.cpp index ebd76ee6a..0b8aaa25f 100644 --- a/test/stdexec/algos/adaptors/test_sequence.cpp +++ b/test/stdexec/algos/adaptors/test_sequence.cpp @@ -50,12 +50,12 @@ namespace struct throwing_connect { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; using completion_signatures = ex::completion_signatures; struct op { - using operation_state_concept = ex::operation_state_t; + using operation_state_concept = ex::operation_state_tag; void start() & noexcept {} }; diff --git a/test/stdexec/algos/adaptors/test_spawn_future.cpp b/test/stdexec/algos/adaptors/test_spawn_future.cpp index 9c27296ec..60543d004 100644 --- a/test/stdexec/algos/adaptors/test_spawn_future.cpp +++ b/test/stdexec/algos/adaptors/test_spawn_future.cpp @@ -378,7 +378,7 @@ namespace struct never { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; template static consteval auto get_completion_signatures(Sender&&, Env&&...) noexcept @@ -390,7 +390,7 @@ namespace template struct opstate { - using operation_state_concept = ex::operation_state_t; + using operation_state_concept = ex::operation_state_tag; template requires std::constructible_from diff --git a/test/stdexec/algos/adaptors/test_starts_on.cpp b/test/stdexec/algos/adaptors/test_starts_on.cpp index 0d68693ed..1c7617a2a 100644 --- a/test/stdexec/algos/adaptors/test_starts_on.cpp +++ b/test/stdexec/algos/adaptors/test_starts_on.cpp @@ -288,7 +288,7 @@ namespace struct sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; template diff --git a/test/stdexec/algos/adaptors/test_upon_error.cpp b/test/stdexec/algos/adaptors/test_upon_error.cpp index 67d9206cd..da7dfcc4c 100644 --- a/test/stdexec/algos/adaptors/test_upon_error.cpp +++ b/test/stdexec/algos/adaptors/test_upon_error.cpp @@ -92,7 +92,7 @@ namespace template struct many_error_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; @@ -96,7 +96,7 @@ namespace { struct my_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; @@ -135,7 +135,7 @@ namespace { struct my_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; diff --git a/test/stdexec/concepts/test_concepts_receiver.cpp b/test/stdexec/concepts/test_concepts_receiver.cpp index bca95dd32..8512e8812 100644 --- a/test/stdexec/concepts/test_concepts_receiver.cpp +++ b/test/stdexec/concepts/test_concepts_receiver.cpp @@ -22,7 +22,7 @@ namespace ex = STDEXEC; struct recv_no_set_value { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; void set_stopped() noexcept {} void set_error(std::exception_ptr) noexcept {} @@ -36,7 +36,7 @@ struct recv_no_set_value struct recv_set_value_except { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; void set_value() {} void set_stopped() noexcept {} @@ -51,7 +51,7 @@ struct recv_set_value_except struct recv_set_value_noexcept { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; void set_value() noexcept {} void set_stopped() noexcept {} @@ -66,7 +66,7 @@ struct recv_set_value_noexcept struct recv_set_error_except { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; void set_value() noexcept {} void set_stopped() noexcept {} @@ -83,7 +83,7 @@ struct recv_set_error_except }; struct recv_set_stopped_except { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; void set_value() noexcept {} void set_stopped() @@ -101,7 +101,7 @@ struct recv_set_stopped_except struct recv_non_movable { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; recv_non_movable() = default; ~recv_non_movable() = default; diff --git a/test/stdexec/concepts/test_concepts_sender.cpp b/test/stdexec/concepts/test_concepts_sender.cpp index 5bc1952c3..5b82f793d 100644 --- a/test/stdexec/concepts/test_concepts_sender.cpp +++ b/test/stdexec/concepts/test_concepts_sender.cpp @@ -38,7 +38,7 @@ namespace struct P2300r7_sender_1 { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; }; struct P2300r7_sender_2 @@ -100,7 +100,7 @@ namespace struct my_sender0 { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; @@ -113,7 +113,7 @@ namespace struct void_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; template @@ -125,7 +125,7 @@ namespace struct invalid_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; template void set_value(As&&...) noexcept @@ -161,7 +161,7 @@ namespace struct my_sender_int { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; @@ -217,7 +217,7 @@ namespace struct multival_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; @@ -239,7 +239,7 @@ namespace struct ec_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; @@ -261,7 +261,7 @@ namespace struct my_r5_sender0 { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; diff --git a/test/stdexec/cpos/cpo_helpers.cuh b/test/stdexec/cpos/cpo_helpers.cuh index ed21eba15..d7f69b0f0 100644 --- a/test/stdexec/cpos/cpo_helpers.cuh +++ b/test/stdexec/cpos/cpo_helpers.cuh @@ -34,7 +34,7 @@ namespace template struct cpo_t { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; static constexpr scope_t scope = Scope; using completion_signatures = ex::completion_signatures; diff --git a/test/stdexec/cpos/test_cpo_connect.cpp b/test/stdexec/cpos/test_cpo_connect.cpp index c04c522b7..723935bde 100644 --- a/test/stdexec/cpos/test_cpo_connect.cpp +++ b/test/stdexec/cpos/test_cpo_connect.cpp @@ -42,7 +42,7 @@ namespace struct my_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; int value_{0}; @@ -57,7 +57,7 @@ namespace struct my_sender_unconstrained { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; int value_{0}; diff --git a/test/stdexec/cpos/test_cpo_schedule.cpp b/test/stdexec/cpos/test_cpo_schedule.cpp index 6311524e6..845b2d1f8 100644 --- a/test/stdexec/cpos/test_cpo_schedule.cpp +++ b/test/stdexec/cpos/test_cpo_schedule.cpp @@ -28,7 +28,7 @@ namespace struct my_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; diff --git a/test/stdexec/queries/test_get_forward_progress_guarantee.cpp b/test/stdexec/queries/test_get_forward_progress_guarantee.cpp index 8fa3d3d87..3d2259db6 100644 --- a/test/stdexec/queries/test_get_forward_progress_guarantee.cpp +++ b/test/stdexec/queries/test_get_forward_progress_guarantee.cpp @@ -34,7 +34,7 @@ namespace struct sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; @@ -79,7 +79,7 @@ namespace struct sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; diff --git a/test/stdexec/schedulers/test_task_scheduler.cpp b/test/stdexec/schedulers/test_task_scheduler.cpp index da856be87..aebf899a6 100644 --- a/test/stdexec/schedulers/test_task_scheduler.cpp +++ b/test/stdexec/schedulers/test_task_scheduler.cpp @@ -54,7 +54,7 @@ namespace template struct opaque_sender : private Sndr { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; explicit opaque_sender(Sndr sndr) : Sndr{std::move(sndr)} {} diff --git a/test/test_common/receivers.hpp b/test/test_common/receivers.hpp index 63f73bc06..55e4c4189 100644 --- a/test/test_common/receivers.hpp +++ b/test/test_common/receivers.hpp @@ -35,7 +35,7 @@ namespace { struct recv0 { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; void set_value() noexcept {} @@ -46,7 +46,7 @@ namespace struct recv_int { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; void set_value(int) noexcept {} @@ -57,7 +57,7 @@ namespace struct recv0_ec { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; void set_value() noexcept {} @@ -70,7 +70,7 @@ namespace struct recv_int_ec { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; void set_value(int) noexcept {} @@ -90,7 +90,7 @@ namespace _Env env_{}; public: - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; base_expect_receiver() = default; ~base_expect_receiver() @@ -153,7 +153,7 @@ namespace struct expect_void_receiver_ex { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; expect_void_receiver_ex(bool& executed) : executed_(&executed) @@ -228,7 +228,7 @@ namespace Env env_{}; public: - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; explicit expect_value_receiver_ex(T& dest) : dest_(&dest) @@ -295,7 +295,7 @@ namespace template > struct expect_stopped_receiver_ex { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; explicit expect_stopped_receiver_ex(bool& executed) : executed_(&executed) @@ -415,7 +415,7 @@ namespace template > struct expect_error_receiver_ex { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; explicit expect_error_receiver_ex(T& value) : value_(&value) @@ -460,7 +460,7 @@ namespace struct logging_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; logging_receiver(int& state) : state_(&state) @@ -499,7 +499,7 @@ namespace template struct typecat_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; T* value_; typecat* cat_; @@ -539,7 +539,7 @@ namespace template struct fun_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; F f_; template diff --git a/test/test_common/retry.hpp b/test/test_common/retry.hpp index cca53ac20..4374f1fa1 100644 --- a/test/test_common/retry.hpp +++ b/test/test_common/retry.hpp @@ -68,7 +68,7 @@ namespace template struct _retry_receiver { - using receiver_concept = STDEXEC::receiver_t; + using receiver_concept = STDEXEC::receiver_tag; _op_base* o_; auto base() && noexcept -> R&& @@ -152,7 +152,7 @@ namespace template struct _retry_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; S s_; explicit _retry_sender(S s) diff --git a/test/test_common/schedulers.hpp b/test/test_common/schedulers.hpp index 3cebc5298..dd44cbf43 100644 --- a/test/test_common/schedulers.hpp +++ b/test/test_common/schedulers.hpp @@ -57,7 +57,7 @@ namespace //! operation_state object is created and started). struct impulse_scheduler { - using scheduler_concept = ex::scheduler_t; + using scheduler_concept = ex::scheduler_tag; impulse_scheduler() : shared_data_(std::make_shared(0)) @@ -174,7 +174,7 @@ namespace struct sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; @@ -206,7 +206,7 @@ namespace template struct basic_inline_scheduler { - using scheduler_concept = ex::scheduler_t; + using scheduler_concept = ex::scheduler_tag; auto schedule() const noexcept { @@ -235,7 +235,7 @@ namespace struct sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; template @@ -310,7 +310,7 @@ namespace template struct error_scheduler { - using scheduler_concept = ex::scheduler_t; + using scheduler_concept = ex::scheduler_tag; error_scheduler() = default; @@ -348,7 +348,7 @@ namespace struct sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; @@ -380,7 +380,7 @@ namespace struct sender; public: - using scheduler_concept = ex::scheduler_t; + using scheduler_concept = ex::scheduler_tag; auto operator==(stopped_scheduler const &) const noexcept -> bool = default; @@ -411,7 +411,7 @@ namespace struct sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; @@ -445,7 +445,7 @@ namespace template struct _opstate_t : ex::__immovable { - using operation_state_concept = ex::operation_state_t; + using operation_state_concept = ex::operation_state_tag; constexpr _opstate_t(Rcvr rcvr) noexcept : _rcvr(static_cast(rcvr)) @@ -462,7 +462,7 @@ namespace template struct _sndr_t { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; template static consteval auto get_completion_signatures() noexcept @@ -488,7 +488,7 @@ namespace template struct dummy_scheduler : _dummy::_attrs_t { - using scheduler_concept = ex::scheduler_t; + using scheduler_concept = ex::scheduler_tag; static constexpr auto schedule() noexcept -> _dummy::_sndr_t { diff --git a/test/test_common/senders.hpp b/test/test_common/senders.hpp index 4d89c870a..b5ca1cdf3 100644 --- a/test/test_common/senders.hpp +++ b/test/test_common/senders.hpp @@ -30,7 +30,7 @@ namespace template struct a_sender_of { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; using completion_signatures = ex::completion_signatures; struct operation @@ -48,7 +48,7 @@ namespace template struct fallible_just { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; explicit fallible_just(Values... values) : values_(std::move(values)...) @@ -133,7 +133,7 @@ namespace { std::remove_cvref_t env_; std::tuple values_; - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; using completion_signatures = ex::completion_signatures; template @@ -163,7 +163,7 @@ namespace struct completes_if { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; using completion_signatures = ex::completion_signatures; bool condition_; @@ -253,7 +253,7 @@ namespace template struct succeed_n_sender { - using sender_concept = STDEXEC::sender_t; + using sender_concept = STDEXEC::sender_tag; using completion_signatures = ex::completion_signatures; explicit succeed_n_sender(int count, Tag, Args... args) @@ -297,7 +297,7 @@ namespace template struct just_ref { - using sender_concept = ex::sender_t; + using sender_concept = ex::sender_tag; explicit just_ref(Type& value) : value_(value) @@ -334,7 +334,7 @@ namespace template struct opstate { - using operation_state_concept = ex::operation_state_t; + using operation_state_concept = ex::operation_state_tag; explicit opstate(Type& value, Receiver rcvr) : value_(value)