Skip to content

Commit

Permalink
Merge pull request NVIDIA#1270 from maikel/fix-call-to-connect
Browse files Browse the repository at this point in the history
fully qualify all calls to connect in exec
  • Loading branch information
ericniebler authored Mar 4, 2024
2 parents a0f8ebc + 8123fec commit 3e724de
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion include/exec/reschedule.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ namespace exec {
friend auto tag_invoke(connect_t, __sender, _Receiver __rcvr)
-> connect_result_t<__schedule_sender_t<env_of_t<_Receiver>>, _Receiver> {
auto __sched = get_scheduler(get_env(__rcvr));
return connect(schedule(__sched), static_cast<_Receiver&&>(__rcvr));
return stdexec::connect(schedule(__sched), static_cast<_Receiver&&>(__rcvr));
}

friend auto tag_invoke(get_env_t, __sender) noexcept {
Expand Down
6 changes: 3 additions & 3 deletions include/exec/static_thread_pool.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,7 @@ namespace exec {

__t(static_thread_pool_& pool, Shape shape, Fun fun, CvrefSender&& sndr, Receiver rcvr)
: shared_state_(pool, static_cast<Receiver&&>(rcvr), shape, fun)
, inner_op_{connect(static_cast<CvrefSender&&>(sndr), bulk_rcvr{shared_state_})} {
, inner_op_{stdexec::connect(static_cast<CvrefSender&&>(sndr), bulk_rcvr{shared_state_})} {
}
};

Expand Down Expand Up @@ -1464,7 +1464,7 @@ namespace exec {
while (i0 + chunkSize < size) {
for (std::size_t i = i0; i < i0 + chunkSize; ++i) {
op.items_[i].__construct_with([&] {
return connect(set_next(op.rcvr_, ItemSender{&op, it + i}), NextReceiver{&op});
return stdexec::connect(set_next(op.rcvr_, ItemSender{&op, it + i}), NextReceiver{&op});
});
start(op.items_[i].__get());
}
Expand All @@ -1475,7 +1475,7 @@ namespace exec {
}
for (std::size_t i = i0; i < size; ++i) {
op.items_[i].__construct_with([&] {
return connect(set_next(op.rcvr_, ItemSender{&op, it + i}), NextReceiver{&op});
return stdexec::connect(set_next(op.rcvr_, ItemSender{&op, it + i}), NextReceiver{&op});
});
start(op.items_[i].__get());
}
Expand Down

0 comments on commit 3e724de

Please sign in to comment.