Skip to content

Commit 825d79c

Browse files
authored
Merge pull request #1994 from ericniebler/rename-concept-tags
rename concept tag types per P4154R0
2 parents 707023f + 6909bf3 commit 825d79c

File tree

123 files changed

+298
-293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+298
-293
lines changed

docs/source/developer/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ member functions that handle completion:
8787
.. code-block:: cpp
8888
8989
struct MyReceiver {
90-
using receiver_concept = stdexec::receiver_t;
90+
using receiver_concept = stdexec::receiver_tag;
9191
9292
void set_value(int v) noexcept { /* success */ }
9393
void set_error(std::exception_ptr e) noexcept { /* error */ }

examples/algorithms/retry.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ struct _op
121121
template <class S>
122122
struct _retry_sender
123123
{
124-
using sender_concept = stdexec::sender_t;
124+
using sender_concept = stdexec::sender_tag;
125125
S s_;
126126

127127
explicit _retry_sender(S s)

examples/algorithms/then.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class _then_receiver : public exec::receiver_adaptor<_then_receiver<R, F>, R>
5959
template <stdexec::sender S, class F>
6060
struct _then_sender
6161
{
62-
using sender_concept = stdexec::sender_t;
62+
using sender_concept = stdexec::sender_tag;
6363

6464
S s_;
6565
F f_;

examples/benchmark/fibonacci.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ using fib_sender = any_sender_of<stdexec::set_value_t(long)>;
3838
template <typename Scheduler>
3939
struct fib_s
4040
{
41-
using sender_concept = stdexec::sender_t;
41+
using sender_concept = stdexec::sender_tag;
4242
using completion_signatures = stdexec::completion_signatures<stdexec::set_value_t(long)>;
4343

4444
long cutoff;

examples/nvexec/maxwell/snr.cuh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ namespace nvexec
3333
{
3434
struct stream_receiver_base
3535
{
36-
using receiver_concept = ex::receiver_t;
36+
using receiver_concept = ex::receiver_tag;
3737
};
3838

3939
struct stream_sender_base
4040
{
41-
using sender_concept = ex::sender_t;
41+
using sender_concept = ex::sender_tag;
4242
};
4343

4444
namespace detail
@@ -97,7 +97,7 @@ namespace _repeat_n
9797
{
9898
using receiver_t = OpState::receiver_t;
9999
public:
100-
using receiver_concept = ex::receiver_t;
100+
using receiver_concept = ex::receiver_tag;
101101

102102
explicit receiver(OpState& op_state)
103103
: opstate_(op_state)
@@ -198,7 +198,7 @@ namespace _repeat_n
198198
template <class Sender, class Closure>
199199
struct sender
200200
{
201-
using sender_concept = ex::sender_t;
201+
using sender_concept = ex::sender_tag;
202202

203203
template <class, class Env>
204204
static consteval auto get_completion_signatures() noexcept
@@ -352,7 +352,7 @@ namespace nv::execution::_strm
352352
template <class Sender, class Closure>
353353
struct sender
354354
{
355-
using sender_concept = ex::sender_t;
355+
using sender_concept = ex::sender_tag;
356356

357357
using completion_signatures = ex::completion_signatures<ex::set_value_t(),
358358
ex::set_stopped_t(),

examples/problem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace ex = stdexec;
2424

2525
struct receiver_t
2626
{
27-
using receiver_concept = ex::receiver_t;
27+
using receiver_concept = ex::receiver_tag;
2828

2929
void set_value() && noexcept {}
3030

@@ -78,7 +78,7 @@ struct expect_value_receiver_ex
7878
T dest_;
7979
Env env_{};
8080

81-
using receiver_concept = stdexec::receiver_t;
81+
using receiver_concept = stdexec::receiver_tag;
8282

8383
explicit expect_value_receiver_ex(T dest)
8484
: dest_(dest)

examples/retry.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
// Example code:
2525
struct fail_some
2626
{
27-
using sender_concept = stdexec::sender_t;
27+
using sender_concept = stdexec::sender_tag;
2828
using completion_signatures =
2929
stdexec::completion_signatures<stdexec::set_value_t(int),
3030
stdexec::set_error_t(std::exception_ptr)>;

examples/scope.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ using stdexec::sync_wait;
2929

3030
struct noop_receiver
3131
{
32-
using receiver_concept = receiver_t;
32+
using receiver_concept = receiver_tag;
3333

3434
template <class... _As>
3535
void set_value(_As&&...) noexcept

include/exec/any_sender_of.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ namespace experimental::execution
261261
private:
262262
using _base_t = STDEXEC::__any::__interface_base<_isemi_receiver, Base, _extends_base_t>;
263263
public:
264-
using receiver_concept = STDEXEC::receiver_t;
264+
using receiver_concept = STDEXEC::receiver_tag;
265265
using _base_t::_base_t;
266266
};
267267

@@ -402,7 +402,7 @@ namespace experimental::execution
402402
template <class Base>
403403
struct _iopstate : _iopstate_base_t<Base>
404404
{
405-
using operation_state_concept = STDEXEC::operation_state_t;
405+
using operation_state_concept = STDEXEC::operation_state_tag;
406406
using _iopstate_base_t<Base>::_iopstate_base_t;
407407

408408
virtual constexpr void start() & noexcept
@@ -425,7 +425,7 @@ namespace experimental::execution
425425
template <class Receiver, class TargetStopToken>
426426
struct _any_opstate
427427
{
428-
using operation_state_concept = STDEXEC::operation_state_t;
428+
using operation_state_concept = STDEXEC::operation_state_tag;
429429

430430
template <class AnySender>
431431
constexpr explicit _any_opstate(AnySender &&_sndr, Receiver _rcvr)
@@ -473,7 +473,7 @@ namespace experimental::execution
473473
using _any_receiver_ref_t = __pointer_receiver<typename _ireceiver_t::_pointer_t>;
474474
using _base_t = STDEXEC::__any::__interface_base<_interface_, Base, _extends_t>;
475475
public:
476-
using sender_concept = STDEXEC::sender_t;
476+
using sender_concept = STDEXEC::sender_tag;
477477
using _base_t::_base_t;
478478

479479
template <__std::derived_from<_interface_> Self, class... Env>
@@ -546,7 +546,7 @@ namespace experimental::execution
546546
using _base_t =
547547
STDEXEC::__any::__interface_base<_interface_, _inject_query_memfn_t<Base>, _extends_t>;
548548
public:
549-
using scheduler_concept = STDEXEC::scheduler_t;
549+
using scheduler_concept = STDEXEC::scheduler_tag;
550550
using _base_t::_base_t;
551551

552552
[[nodiscard]]

include/exec/asio/completion_token.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ namespace experimental::execution::asio
408408
{
409409
using args_type_ = std::tuple<std::decay_t<Args>...>;
410410
public:
411-
using sender_concept = ::STDEXEC::sender_t;
411+
using sender_concept = ::STDEXEC::sender_tag;
412412

413413
template <typename T, typename... Us>
414414
requires std::constructible_from<Initiation, T>

0 commit comments

Comments
 (0)