Skip to content

Commit fa2af39

Browse files
committed
Improved wording for 4182
1 parent 858ab8f commit fa2af39

File tree

1 file changed

+28
-2
lines changed

1 file changed

+28
-2
lines changed

xml/issue4182.xml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,38 @@ Set priority to 3 after reflector poll.
2626
</p>
2727
<p>"I'd very much like to see `nullptr` added to the footnote."</p>
2828

29+
<superseded>
30+
<p>
31+
This wording is relative to <paper num="N5001"/>.
32+
</p>
33+
34+
35+
<ol>
36+
<li><p>Modify <sref ref="[support.types.nullptr]"/> as indicated:</p>
37+
38+
<blockquote>
39+
<p>
40+
-2- The macro `NULL` is an implementation-defined null pointer constant <ins>that is a literal
41+
(<sref ref="[lex.icon]"/>, <sref ref="[lex.nullptr]"/>)</ins>.<sup>footnote 161</sup>
42+
<p/>
43+
<small>161) Possible definitions include `0` and `0L`, but not `(void*)0`.</small>
44+
</p>
45+
</blockquote>
46+
47+
</li>
48+
49+
</ol>
50+
</superseded>
51+
52+
<note>2025-02-07; Jonathan provides improved wording</note>
53+
2954
</discussion>
3055

3156
<resolution>
3257
<p>
3358
This wording is relative to <paper num="N5001"/>.
3459
</p>
3560

36-
3761
<ol>
3862
<li><p>Modify <sref ref="[support.types.nullptr]"/> as indicated:</p>
3963

@@ -42,13 +66,15 @@ This wording is relative to <paper num="N5001"/>.
4266
-2- The macro `NULL` is an implementation-defined null pointer constant <ins>that is a literal
4367
(<sref ref="[lex.icon]"/>, <sref ref="[lex.nullptr]"/>)</ins>.<sup>footnote 161</sup>
4468
<p/>
45-
<small>161) Possible definitions include `0` and `0L`, but not `(void*)0`.</small>
69+
<small>161) Possible definitions include <ins>`nullptr`,</ins> `0` and `0L`,
70+
but not `(void*)0`.</small>
4671
</p>
4772
</blockquote>
4873

4974
</li>
5075

5176
</ol>
77+
5278
</resolution>
5379

5480
</issue>

0 commit comments

Comments
 (0)