Skip to content

make the trailing on algorithm update the env properly #1721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ericniebler wants to merge 1 commit into
base: main
Choose a base branch
from
Open

make the trailing on algorithm update the env properly #1721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/stdexec/__detail/__meta.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ namespace STDEXEC {

using __msuccess = int;

template <class _What, class... _With>
template <class... _What>
struct _WARNING_ { };

template <class... _What>
Expand Down
16 changes: 7 additions & 9 deletions include/stdexec/__detail/__on.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "__sender_adaptor_closure.hpp"
#include "__sender_introspection.hpp"
#include "__utility.hpp"
#include "__write_env.hpp"

namespace STDEXEC {
/////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -131,15 +132,12 @@ namespace STDEXEC {
>;

template <class _Sender, class _OldSched, class _NewSched>
static constexpr auto __reschedule(
_Sender&& __sndr,
[[maybe_unused]] _OldSched&& __old_sched,
_NewSched&& __new_sched) {
// BUGBUG TODO(ericniebler): FIXME
// return continues_on(
// write_env(static_cast<_Sender&&>(__sndr), __sched_env{__old_sched}),
// static_cast<_NewSched&&>(__new_sched));
return continues_on(static_cast<_Sender&&>(__sndr), static_cast<_NewSched&&>(__new_sched));
static constexpr auto
__reschedule(_Sender&& __sndr, _OldSched&& __old_sched, _NewSched&& __new_sched) {
return continues_on(
write_env(static_cast<_Sender&&>(__sndr), __sched_env{__old_sched}),
static_cast<_NewSched&&>(__new_sched));
// return continues_on(static_cast<_Sender&&>(__sndr), static_cast<_NewSched&&>(__new_sched));
}
};

Expand Down
2 changes: 1 addition & 1 deletion test/stdexec/algos/adaptors/test_on3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ namespace {
auto snd = ex::get_scheduler() | ex::on(inline_scheduler{}, probe_env())
| ex::then([]<class Env>(Env) noexcept {
using Sched = ex::__call_result_t<ex::get_scheduler_t, Env>;
static_assert(std::same_as<Sched, ex::run_loop::scheduler>);
static_assert(std::same_as<Sched, inline_scheduler>);
})
| probe_env() | ex::then([]<class Env>(Env) noexcept {
using Sched = ex::__call_result_t<ex::get_scheduler_t, Env>;
Expand Down
Loading