Skip to content

Commit a78089f

Browse files
committed
Fix CI failure
Move the deprecated definitions in the base class, to avoid some weird shadowing error.
1 parent a6dfb60 commit a78089f

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

include/stdexec/__detail/__bulk.hpp

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,22 @@ namespace stdexec {
192192
{}
193193
};
194194
}
195+
196+
template <sender _Sender, integral _Shape, copy_constructible _Fun>
197+
[[deprecated("The bulk algorithm now requires an execution policy such as stdexec::par as an argument.")]]
198+
STDEXEC_ATTRIBUTE((host, device)) auto operator()(_Sender&& __sndr, _Shape __shape, _Fun __fun) const {
199+
return (*this)(
200+
static_cast<_Sender&&>(__sndr),
201+
par,
202+
static_cast<_Shape&&>(__shape),
203+
static_cast<_Fun&&>(__fun));
204+
}
205+
206+
template <integral _Shape, copy_constructible _Fun>
207+
[[deprecated("The bulk algorithm now requires an execution policy such as stdexec::par as an argument.")]]
208+
STDEXEC_ATTRIBUTE((always_inline)) auto operator()(_Shape __shape, _Fun __fun) const {
209+
return (*this)(static_cast<_Shape&&>(__shape), static_cast<_Fun&&>(__fun));
210+
}
195211
};
196212

197213
struct bulk_t : __generic_bulk_t<bulk_t> {
@@ -225,23 +241,6 @@ namespace stdexec {
225241
static auto transform_sender(_Sender&& __sndr, const _Env& __env) {
226242
return __sexpr_apply(static_cast<_Sender&&>(__sndr), __transform_sender_fn(__env));
227243
}
228-
using __generic_bulk_t<bulk_t>::operator();
229-
230-
template <sender _Sender, integral _Shape, copy_constructible _Fun>
231-
[[deprecated("The bulk algorithm now requires an execution policy such as stdexec::par as an argument.")]]
232-
STDEXEC_ATTRIBUTE((host, device)) auto operator()(_Sender&& __sndr, _Shape __shape, _Fun __fun) const {
233-
return (*this)(
234-
static_cast<_Sender&&>(__sndr),
235-
par,
236-
static_cast<_Shape&&>(__shape),
237-
static_cast<_Fun&&>(__fun));
238-
}
239-
240-
template <integral _Shape, copy_constructible _Fun>
241-
[[deprecated("The bulk algorithm now requires an execution policy such as stdexec::par as an argument.")]]
242-
STDEXEC_ATTRIBUTE((always_inline)) auto operator()(_Shape __shape, _Fun __fun) const {
243-
return (*this)(static_cast<_Shape&&>(__shape), static_cast<_Fun&&>(__fun));
244-
}
245244
};
246245

247246
struct bulk_chunked_t : __generic_bulk_t<bulk_chunked_t> { };

0 commit comments

Comments
 (0)