diff --git a/doc/reference.qbk b/doc/reference.qbk index ef64ea0d..cb476cb7 100644 --- a/doc/reference.qbk +++ b/doc/reference.qbk @@ -66638,13 +66638,13 @@ A customisation point that creates a bulk sender. The name `execution::bulk_execute` denotes a customisation point object. If `is_convertible_v` is true, then the expression `execution::bulk_execute(S, F, N)` for some subexpressions `S`, `F`, and `N` is expression-equivalent to: -* `S.bulk_execute(F, N)`, if that expression is valid. If the function selected does not execute `N` invocations of the function object `F` on the executor `S` in bulk with forward progress guarantee `std::query(S, execution::bulk_guarantee)`, and the result of that function does not model `sender`, the program is ill-formed with no diagnostic required. +* `S.bulk_execute(F, N)`, if that expression is valid. If the function selected does not execute `N` invocations of the function object `F` on the executor `S` in bulk with forward progress guarantee `boost::asio::query(S, execution::bulk_guarantee)`, and the result of that function does not model `sender`, the program is ill-formed with no diagnostic required. -* Otherwise, `bulk_execute(S, F, N)`, if that expression is valid, with overload resolution performed in a context that includes the declaration `void bulk_execute();` and that does not include a declaration of `execution::bulk_execute`. If the function selected by overload resolution does not execute `N` invocations of the function object `F` on the executor `S` in bulk with forward progress guarantee `std::query(E, execution::bulk_guarantee)`, and the result of that function does not model `sender`, the program is ill-formed with no diagnostic required. +* Otherwise, `bulk_execute(S, F, N)`, if that expression is valid, with overload resolution performed in a context that includes the declaration `void bulk_execute();` and that does not include a declaration of `execution::bulk_execute`. If the function selected by overload resolution does not execute `N` invocations of the function object `F` on the executor `S` in bulk with forward progress guarantee `boost::asio::query(E, execution::bulk_guarantee)`, and the result of that function does not model `sender`, the program is ill-formed with no diagnostic required. -* Otherwise, if the types `F` and `executor_index_t>` model `invocable` and if `std::query(S, execution::bulk_guarantee)` equals `execution::bulk_guarantee.unsequenced`, then +* Otherwise, if the types `F` and `executor_index_t>` model `invocable` and if `boost::asio::query(S, execution::bulk_guarantee)` equals `execution::bulk_guarantee.unsequenced`, then * Evaluates `DECAY_COPY(std::forward(F))` on the calling thread to create a function object `cf`. [Note: Additional copies of `cf` may subsequently be created. --end note.] diff --git a/include/boost/asio/execution/bulk_execute.hpp b/include/boost/asio/execution/bulk_execute.hpp index ea16fe59..536c6890 100644 --- a/include/boost/asio/execution/bulk_execute.hpp +++ b/include/boost/asio/execution/bulk_execute.hpp @@ -42,9 +42,9 @@ namespace execution { * @li S.bulk_execute(F, N), if that expression is valid. If the * function selected does not execute N invocations of the function * object F on the executor S in bulk with forward progress - * guarantee std::query(S, execution::bulk_guarantee), and the result - * of that function does not model sender, the program is - * ill-formed with no diagnostic required. + * guarantee boost::asio::query(S, execution::bulk_guarantee), and + * the result of that function does not model sender, the + * program is ill-formed with no diagnostic required. * * @li Otherwise, bulk_execute(S, F, N), if that expression is valid, * with overload resolution performed in a context that includes the @@ -52,13 +52,14 @@ namespace execution { * declaration of execution::bulk_execute. If the function selected * by overload resolution does not execute N invocations of the * function object F on the executor S in bulk with forward - * progress guarantee std::query(E, execution::bulk_guarantee), and - * the result of that function does not model sender, the - * program is ill-formed with no diagnostic required. + * progress guarantee boost::asio::query(E, + * execution::bulk_guarantee), and the result of that function does not + * model sender, the program is ill-formed with no diagnostic + * required. * * @li Otherwise, if the types F and * executor_index_t> model invocable and - * if std::query(S, execution::bulk_guarantee) equals + * if boost::asio::query(S, execution::bulk_guarantee) equals * execution::bulk_guarantee.unsequenced, then * * - Evaluates DECAY_COPY(std::forward(F)) on the