Skip to content

Commit e9ccf38

Browse files
committed
Rebase P/R for 2991
1 parent db05fce commit e9ccf38

File tree

1 file changed

+52
-3
lines changed

1 file changed

+52
-3
lines changed

xml/issue2991.xml

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ in the synopsis, but not the detailed description. This was pointed out
3838
during LWG review in Jacksonville.
3939
The approved paper, <paper num="P008R3"/>, doesn't have it in either place.
4040
</p>
41-
</discussion>
42-
43-
<resolution>
41+
<superseded>
4442
<p>
4543
This wording is relative to <a href="https://wg21.link/n4659">N4659</a>.
4644
</p>
@@ -82,5 +80,56 @@ variant(const variant&amp; w) <ins>noexcept(<i>see below</i>)</ins>;
8280
</blockquote>
8381
</li>
8482
</ol>
83+
</superseded>
84+
85+
<note>2025-10-20; Jonathan provides updated wording</note>
86+
87+
</discussion>
88+
89+
<resolution>
90+
<p>
91+
This wording is relative to <paper num="P5014"/>.
92+
</p>
93+
94+
<ol>
95+
<li><p>Edit <sref ref="[variant.variant]"/>, class template <tt>variant</tt> synopsis, as indicated:</p>
96+
97+
<blockquote>
98+
<pre>
99+
template &lt;class... Types&gt;
100+
class variant {
101+
public:
102+
// 23.7.3.1, constructors
103+
constexpr variant() noexcept(<i>see below</i>);
104+
variant(const variant&amp;) <ins>noexcept(<i>see below</i>)</ins>;
105+
variant(variant&amp;&amp;) noexcept(<i>see below</i>);
106+
[&hellip;]
107+
};
108+
</pre>
109+
</blockquote>
110+
</li>
111+
112+
<li><p>Edit <sref ref="[variant.ctor]"/> as indicated:</p>
113+
114+
<blockquote>
115+
<pre>
116+
variant(const variant&amp; w) <ins>noexcept(<i>see below</i>)</ins>;
117+
</pre>
118+
<blockquote>
119+
<p>
120+
[&hellip;]
121+
<p/>
122+
-8- <i>Remarks:</i> This function is defined as deleted unless
123+
<tt>is_copy_constructible_v&lt;T<sub><i>i</i></sub>&gt;</tt> is <tt>true</tt> for all <tt><i>i</i></tt>.
124+
<ins>The exception specification is equivalent to the logical
125+
<span style="font-variant: small-caps">and</span> of
126+
<tt>is_nothrow_copy_constructible_v&lt;T<sub><i>i</i></sub>&gt;</tt>
127+
for all <tt><i>i</i></tt>.</ins>
128+
</p>
129+
</blockquote>
130+
</blockquote>
131+
</li>
132+
</ol>
133+
85134
</resolution>
86135
</issue>

0 commit comments

Comments
 (0)