Skip to content

Commit f939b1f

Browse files
timsong-cppjwakely
authored andcommitted
Fixups for 4432 and 4433
1 parent 774c739 commit f939b1f

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

xml/issue4432.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ template<ranges::input_range R>
4141
<tt>T</tt> is a structural type (<sref ref="[temp.param]"/>),
4242
<tt>is_constructible_v&lt;T, ranges::range_reference_t&lt;R&gt;&gt;</tt> is <tt>true</tt>, and
4343
<del><tt>is_copy_constructible_v&lt;T&gt;</tt> is <tt>true</tt></del>
44-
<ins><tt>T</tt> statisfies <tt>copy_constructible</tt></ins>.</p>
44+
<ins><tt>T</tt> satisfies <tt>copy_constructible</tt></ins>.</p>
4545
<p>-10- Let <tt>V</tt> be the pack of values of type info of the same size as <tt>r</tt>,
4646
where the <i>i<sup>th</sup></i> element is
4747
<tt>reflect_constant(<del><i>e<sub>i</sub></i></del><ins>static_cast&lt;T&gt;(*<i>it<sub>i</sub></i>)</ins>)</tt>,
48-
where <i><del>e<sub>i</sub></del><ins>it<sub>i</sub></ins></i> is <ins>an iterator to</ins> the ith element of <tt>r</tt>.
48+
where <i><del>e<sub>i</sub></del><ins>it<sub>i</sub></ins></i> is <ins>an iterator to</ins> the <i>i<sup>th</sup></i> element of <tt>r</tt>.
4949
</p>
5050
<p>[&hellip;]</p>
5151
</blockquote>

xml/issue4433.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
Language linkage is a property of functions, variables, and function types (<sref ref="[basic.link]"/>),
1818
not of names.
1919
</p>
20+
<note>
21+
The wording below contains a drive-by fix for a misapplication of <paper num="P2996R13"/>
22+
</note>
2023
</discussion>
2124

2225
<resolution>
@@ -37,7 +40,7 @@ consteval bool has_linkage(info r);
3740
</pre>
3841
<blockquote>
3942
<p>-25- <i>Returns</i>: `true` if `r` represents a variable, function, type, template, or namespace
40-
whose name has internal linkage, module linkage, <del>C language linkage, </del>or any linkage,
43+
whose name has internal linkage, module linkage, <del>C language</del><ins>external</ins> linkage, or any linkage,
4144
respectively (<sref ref="[basic.link]"/>). Otherwise, `false`.</p>
4245
</blockquote>
4346

@@ -46,7 +49,7 @@ respectively (<sref ref="[basic.link]"/>). Otherwise, `false`.</p>
4649
</pre>
4750
<blockquote>
4851
<p><ins>-??- <i>Returns</i>: `true` if `r` represents a variable, function, or function type with C language
49-
linkage, module linkage. Otherwise, `false`.</ins></p>
52+
linkage. Otherwise, `false`.</ins></p>
5053
</blockquote>
5154

5255
</li>

0 commit comments

Comments
 (0)