Skip to content

Commit cf2ca4f

Browse files
committed
Update 4438 to cover NB US 220-344
1 parent 4f72821 commit cf2ca4f

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

xml/issue4438.xml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<priority>99</priority>
1010

1111
<discussion>
12+
<b>Addresses <a href="https://github.com/cplusplus/nbballot/issues/919">US 220-344</a></b>
1213
<p>
1314
<sref ref="[exec.when.all]"/> p5 reads as follows:
1415
</p>
@@ -44,6 +45,8 @@ satisfies <tt><i>forwarding-query</i></tt>, `e.query(q)` is expression-equivalen
4445
The problem is with "<tt>state.<i>stop-src</i>.get_token()</tt>" in bullet (5.2). There is no `state`
4546
object here. This expression should be `stop_src.get_token()`.
4647
</p>
48+
49+
<note>Kona 2025-11-05; add edits to address NB comment.</note>
4750
</discussion>
4851

4952
<resolution>
@@ -63,13 +66,14 @@ This wording is relative to <paper num="N5014"/>.
6366
<pre>
6467
template&lt;class Env&gt;
6568
constexpr auto <i>make-when-all-env</i>(inplace_stop_source&amp; stop_src, <i>// exposition only</i>
66-
Env&amp;&amp; env) noexcept {
69+
Env&amp;&amp; env) noexcept<ins>;</ins><del> {
6770
return <i>see below</i>;
68-
}
71+
}</del>
6972
</pre>
7073
</blockquote>
7174
<p>
72-
Returns an object `e` such that
75+
<ins><i>Returns</i>:</ins>
76+
<del>Returns</del> an object `e` such that
7377
</p>
7478
<ul style="list-style-type: none">
7579
<li>(5.1) &mdash; `decltype(e)` models <tt><i>queryable</i></tt>, and
@@ -78,7 +82,7 @@ Returns an object `e` such that
7882
and
7983
</li>
8084
<li>(5.3) &mdash; given a query object `q` with type other than <i>cv</i> `stop_token_t` and whose type
81-
satisfies <tt><i>forwarding-query</i></tt>, `e.query(q)` is expression-equivalent to `get_env(rcvr).query(q)`.
85+
satisfies <tt><i>forwarding-query</i></tt>, `e.query(q)` is expression-equivalent to <del>`get_env(rcvr)`</del><ins>`env`</ins>`.query(q)`.
8286
</li>
8387
</ul>
8488
</blockquote>

0 commit comments

Comments
 (0)