Skip to content

Commit 9e84315

Browse files
committed
Tweak P/R of 3044
1 parent 97fe05b commit 9e84315

File tree

1 file changed

+49
-3
lines changed

1 file changed

+49
-3
lines changed

xml/issue3044.xml

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,7 @@ an exception to be thrown. &mdash; <i>end note</i>]<br/>
169169
</blockquote>
170170

171171
<note>2022-04-25; Daniel rebases wording on <paper num="N4910"/></note>
172-
</discussion>
173-
174-
<resolution>
172+
<superseded>
175173
<p>
176174
This wording is relative to <paper num="N4910"/>.
177175
</p>
@@ -212,6 +210,54 @@ a<ins>3</ins>.max_size()
212210
</li>
213211

214212
</ol>
213+
</superseded>
214+
215+
<note>2025-10-10; Jonathan provides improved wording</note>
216+
217+
</discussion>
218+
219+
<resolution>
220+
<p>
221+
This wording is relative to <paper num="N5014"/>.
222+
</p>
223+
224+
<ol>
225+
<li><p>Change <sref ref="[allocator.requirements.general]"/> as indicated:</p>
226+
227+
228+
<blockquote>
229+
<p>
230+
-2- In subclause <sref ref="[allocator.requirements]"/>,
231+
</p>
232+
<ol style="list-style-type:none">
233+
<li><p>(2.1) &mdash; [&hellip;]</p></li>
234+
<li><p>[&hellip;]</p></li>
235+
<li><p>(2.6) &mdash; <tt>a</tt>, <tt>a1</tt>, <tt>a2</tt> denote lvalues of type <tt>X</tt>,</p></li>
236+
<li><p><ins>(?.?) &mdash; <tt>a3</tt> denotes an lvalue of type (possibly const) <tt>X</tt>,</ins></p></li>
237+
<li><p>[&hellip;]</p></li>
238+
</ol>
239+
<p>[&hellip;]</p>
240+
<pre>
241+
a<ins>3</ins>.max_size()
242+
</pre>
243+
<blockquote>
244+
<p>
245+
-50- <i>Result:</i> <tt>X::size_type</tt>
246+
<p/>
247+
-51- <i>Returns:</i> The largest value that can meaningfully be passed to <tt>X::allocate()</tt>.
248+
<p/>
249+
<ins>[<i>Note:</i> Larger values can cause an exception to be thrown. &mdash; <i>end note</i>]</ins>
250+
<p/>
251+
<ins>-?- <i>Throws:</i> Nothing.</ins>
252+
<p/>
253+
-52- <i>Remarks:</i> Default: <tt>numeric_limits&lt;size_type&gt;::max() / sizeof(value_type)</tt>
254+
</p>
255+
</blockquote>
256+
</blockquote>
257+
</li>
258+
259+
</ol>
260+
215261
</resolution>
216262

217263
</issue>

0 commit comments

Comments
 (0)