@@ -36,8 +36,8 @@ namespace exec {
3636 }
3737 };
3838
39- template <class _BaseEnv >
40- using __env_t = __join_env_t <prop<get_stop_token_t , inplace_stop_token>, _BaseEnv >;
39+ template <class _Env >
40+ using __env_t = __join_env_t <prop<get_stop_token_t , inplace_stop_token>, _Env >;
4141
4242 template <class ... _Ts>
4343 using __nothrow_decay_copyable_and_move_constructible_t = __mbool<(
@@ -56,7 +56,7 @@ namespace exec {
5656 struct __completions_fn {
5757 template <class ... _CvrefSenders>
5858 using __all_value_args_nothrow_decay_copyable = __mand_t <__value_types_t <
59- __completion_signatures_of_t <_CvrefSenders, _Env...>,
59+ __completion_signatures_of_t <_CvrefSenders, __env_t < _Env> ...>,
6060 __qq<__nothrow_decay_copyable_and_move_constructible_t >,
6161 __qq<__mand_t >
6262 >...>;
@@ -66,7 +66,7 @@ namespace exec {
6666 __eptr_completion_if_t <__all_value_args_nothrow_decay_copyable<_CvrefSenders...>>,
6767 completion_signatures<set_stopped_t ()>,
6868 __transform_completion_signatures<
69- __completion_signatures_of_t <_CvrefSenders, _Env...>,
69+ __completion_signatures_of_t <_CvrefSenders, __env_t < _Env> ...>,
7070 __as_rvalues,
7171 __as_error,
7272 set_stopped_t (*)(),
0 commit comments