Skip to content

Commit e945b0d

Browse files
committed
Merge github.com:cplusplus/parallelism-ts
2 parents ca1cc6d + 99921f9 commit e945b0d

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

algorithms.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,9 +315,11 @@ <h1><code>ExecutionPolicy</code> algorithm overloads</h1>
315315
</tr>
316316
</table>
317317

318+
<ins2>
318319
<cxx-note>
319320
Not all algorithms in the Standard Library have counterparts in <cxx-ref to="tab.parallel.algorithms"></cxx-ref>.
320321
</cxx-note>
322+
</ins2>
321323
</cxx-section>
322324
</cxx-section>
323325

exceptions.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ <h1>Header <code>&lt;experimental/exception_list&gt;</code> synopsis</h1>
126126

127127
<cxx-function>
128128
<cxx-signature>
129-
const char* what() const noexcept;
129+
const char* what() const noexcept override;
130130
</cxx-signature>
131131

132132
<cxx-returns>

parallelism-ts.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1481,7 +1481,7 @@ <h1>Contents</h1>
14811481
<cxx-function para_num="10" id="parallel.exceptions.synopsis.10">
14821482

14831483
<pre><code><cxx-signature>
1484-
const char* what() const noexcept;
1484+
const char* what() const noexcept override;
14851485
</cxx-signature></code></pre>
14861486

14871487
<dl>
@@ -1885,12 +1885,14 @@ <h1>Contents</h1>
18851885
</tbody>
18861886
</table>
18871887

1888+
<ins2>
18881889
<cxx-note><span class="nowrap">[ <em>Note:</em></span>
18891890

18901891
Not all algorithms in the Standard Library have counterparts in <cxx-ref to="tab.parallel.algorithms"><a title="tab.parallel.algorithms" href="#tab.parallel.algorithms">Table 1</a></cxx-ref>.
18911892

18921893
<span class="nowrap"><em>end note</em> ]</span>
18931894
</cxx-note>
1895+
</ins2>
18941896

18951897
</section>
18961898
</cxx-section>

parallelism-ts.pdf

55 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)