Skip to content

Commit df6971e

Browse files
jaredhoberockjaredhoberock
committed
Delete <del> lines and remove <ins> tags
1 parent 89ebb58 commit df6971e

File tree

4 files changed

+68
-205
lines changed

4 files changed

+68
-205
lines changed

‎algorithms.html

Lines changed: 42 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -282,39 +282,37 @@ <h1><code>ExecutionPolicy</code> algorithm overloads</h1>
282282
</cxx-section>
283283

284284
<cxx-section id="parallel.alg.defns">
285-
<ins>
286-
<h1>Definitions</h1>
285+
<h1>Definitions</h1>
287286

288-
<p>
289-
Define <code><em>GENERALIZED_SUM</em>(op, a1, ..., aN)</code> as follows:
290-
291-
<ul>
292-
<li><code>a1</code> when <code>N</code> is <code>1</code></li>
293-
294-
<li>
295-
<code>op(<em>GENERALIZED_SUM</em>(op, b1, ..., bM)</code>, <code><em>GENERALIZED_SUM</em>(op, bM, ..., bN))</code> where
296-
297-
<ul>
298-
<li><code>b1, ..., bN</code> may be any permutation of <code>a1, ..., aN</code> and</li>
299-
300-
<li><code>0 < M &lt; N</code>.</li>
301-
</ul>
302-
</li>
303-
</ul>
304-
</p>
305-
306-
<p>
307-
Define <code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(op, a1, ..., aN)</code> as follows:
308-
309-
<ul>
310-
<li><code>a1</code> when <code>N</code> is <code>1</code></li>
287+
<p>
288+
Define <code><em>GENERALIZED_SUM</em>(op, a1, ..., aN)</code> as follows:
311289

312-
<li>
313-
<code>op(<em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(op, a1, ..., aM), <em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(op, aM, ..., aN)</code> where <code>0 &lt; M &lt; N</code>.
314-
</li>
315-
</ul>
316-
</p>
317-
</ins>
290+
<ul>
291+
<li><code>a1</code> when <code>N</code> is <code>1</code></li>
292+
293+
<li>
294+
<code>op(<em>GENERALIZED_SUM</em>(op, b1, ..., bM)</code>, <code><em>GENERALIZED_SUM</em>(op, bM, ..., bN))</code> where
295+
296+
<ul>
297+
<li><code>b1, ..., bN</code> may be any permutation of <code>a1, ..., aN</code> and</li>
298+
299+
<li><code>0 &lt; M &lt; N</code>.</li>
300+
</ul>
301+
</li>
302+
</ul>
303+
</p>
304+
305+
<p>
306+
Define <code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(op, a1, ..., aN)</code> as follows:
307+
308+
<ul>
309+
<li><code>a1</code> when <code>N</code> is <code>1</code></li>
310+
311+
<li>
312+
<code>op(<em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(op, a1, ..., aM), <em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(op, aM, ..., aN)</code> where <code>0 &lt; M &lt; N</code>.
313+
</li>
314+
</ul>
315+
</p>
318316
</cxx-section>
319317

320318
<cxx-section id="parallel.alg.novel">
@@ -331,21 +329,12 @@ <h1>Header <code>&lt;experimental/algorithm&gt;</code> synopsis</h1>
331329
namespace parallel {
332330
template&lt;class ExecutionPolicy,
333331
class InputIterator, class Function&gt;
334-
<del> InputIterator for_each(ExecutionPolicy&& exec,</del>
335-
<del> InputIterator first, InputIterator last,</del>
336-
<del> Function f);</del>
337-
<ins> void for_each(ExecutionPolicy&& exec,</ins>
338-
<ins> InputIterator first, InputIterator last,</ins>
339-
<ins> Function f);</ins>
332+
void for_each(ExecutionPolicy&& exec,
333+
InputIterator first, InputIterator last,
334+
Function f);
340335
template&lt;class InputIterator, class Size, class Function&gt;
341-
<del> Function for_each_n(InputIterator first, Size n,</del>
342-
<del> Function f);</del>
343-
<ins> InputIterator for_each_n(InputIterator first, Size n,</ins>
344-
<ins> Function f);</ins>
345-
<del> template&lt;class ExecutionPolicy,</del>
346-
<del> class InputIterator, class Size, class Function&gt;</del>
347-
<del> InputIterator for_each_n(ExecutionPolicy&& exec, InputIterator first, Size n,</del>
348-
<del> Function f);</del>
336+
InputIterator for_each_n(InputIterator first, Size n,
337+
Function f);
349338
}
350339
}
351340
}
@@ -359,12 +348,9 @@ <h1>For each</h1>
359348
<cxx-signature>
360349
template&lt;class ExecutionPolicy,
361350
class InputIterator, class Function&gt;
362-
<del> InputIterator for_each(ExecutionPolicy&& exec,</del>
363-
<del> InputIterator first, InputIterator last,</del>
364-
<del> Function f);</del>
365-
<ins> void for_each(ExecutionPolicy&& exec,</ins>
366-
<ins> InputIterator first, InputIterator last,</ins>
367-
<ins> Function f);</ins>
351+
void for_each(ExecutionPolicy&& exec,
352+
InputIterator first, InputIterator last,
353+
Function f);
368354
</cxx-signature>
369355

370356
<cxx-effects>
@@ -376,12 +362,6 @@ <h1>For each</h1>
376362
</cxx-note>
377363
</cxx-effects>
378364

379-
<del>
380-
<cxx-returns>
381-
<code>first + (last - first)</code>.
382-
</cxx-returns>
383-
</del>
384-
385365
<cxx-complexity>
386366
Applies <code>f</code> exactly <code>last - first</code> times.
387367
</cxx-complexity>
@@ -400,10 +380,8 @@ <h1>For each</h1>
400380
<cxx-function>
401381
<cxx-signature>
402382
template&lt;class InputIterator, class Size, class Function&gt;
403-
<del> Function for_each_n(InputIterator first, Size n,</del>
404-
<del> Function f);</del>
405-
<ins> InputIterator for_each_n(InputIterator first, Size n,</ins>
406-
<ins> Function f);</ins>
383+
InputIterator for_each_n(InputIterator first, Size n,
384+
Function f);
407385
</cxx-signature>
408386

409387
<cxx-requires>
@@ -424,57 +402,10 @@ <h1>For each</h1>
424402
</cxx-note>
425403
</cxx-effects>
426404

427-
<cxx-returns>
428-
<del><code>std::move(f)</code></del><ins><code>first + n</code></ins>.
429-
</cxx-returns>
430-
431405
<cxx-remarks>
432406
If <code>f</code> returns a result, the result is ignored.
433407
</cxx-remarks>
434408
</cxx-function>
435-
436-
<del>
437-
<cxx-function>
438-
<cxx-signature>
439-
template&lt;class ExecutionPolicy,
440-
class InputIterator, class Size, class Function&gt;
441-
InputIterator for_each_n(ExecutionPolicy&& exec,
442-
InputIterator first, Size n,
443-
Function f);
444-
</cxx-signature>
445-
446-
<cxx-requires>
447-
<code>Function</code> shall meet the requirements of <code>MoveConstructible</code>.
448-
449-
<cxx-note>
450-
<code>Function</code> need not meet the requirements of <code>CopyConstructible</code>.
451-
</cxx-note>
452-
</cxx-requires>
453-
454-
<cxx-effects>
455-
Applies <code>f</code> to the result of dereferencing every iterator in the range
456-
<code>[first,first + n)</code>, starting from <code>first</code> and proceeding to
457-
<code>first + n - 1</code>.
458-
459-
<cxx-note>
460-
If the type of <code>first</code> satisfies the requirements of a mutable iterator,
461-
<code>f</code> may apply nonconstant functions through the dereferenced iterator.
462-
</cxx-note>
463-
</cxx-effects>
464-
465-
<cxx-returns>
466-
<code>first + n</code>.
467-
</cxx-returns>
468-
469-
<cxx-complexity>
470-
Applies <code>f</code> exactly <code>n</code> times.
471-
</cxx-complexity>
472-
473-
<cxx-remarks>
474-
If <code>f</code> returns a result, the result is ignored.
475-
</cxx-remarks>
476-
</cxx-function>
477-
</del>
478409
</cxx-section>
479410

480411
<cxx-section id="parallel.alg.novel.numeric.synop">
@@ -543,11 +474,11 @@ <h1>Reduce</h1>
543474
</cxx-signature>
544475

545476
<cxx-returns>
546-
<code>reduce(first, last, typename iterator_traits&lt;InputIterator&gt;::value_type<del>(0)</del><ins>{}</ins>)</code>
477+
<code>reduce(first, last, typename iterator_traits&lt;InputIterator&gt;::value_type{})</code>
547478
</cxx-returns>
548479

549480
<cxx-requires>
550-
<code>typename iterator_traits&lt;InputIterator&gt;::value_type<del>(0)</del><ins>{}</ins></code>
481+
<code>typename iterator_traits&lt;InputIterator&gt;::value_type{}</code>
551482
shall be a valid expression. The <code>operator+</code> function associated with
552483
<code>iterator_traits&lt;InputIterator&gt;::value_type</code> shall not invalidate iterators or
553484
subranges, nor modify elements in the range <code>[first,last)</code>.
@@ -630,7 +561,7 @@ <h1>Exclusive scan</h1>
630561
</cxx-signature>
631562

632563
<cxx-returns>
633-
<code>exclusive_scan(first, last, result, init, plus<>())</code>
564+
<code>exclusive_scan(first, last, result, init, plus&lt;&gt;())</code>
634565
</cxx-returns>
635566

636567
<cxx-requires>

‎exceptions.html

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,12 @@ <h1>Exception reporting behavior</h1>
6262
typedef const value_type& const_reference;
6363
typedef <em>implementation-defined</em> const_iterator;
6464
typedef const_iterator iterator;
65-
<ins> typedef typename iterator_traits<const_iterator>::difference_type difference_type;</ins>
65+
typedef typename iterator_traits<const_iterator>::difference_type difference_type;
6666
typedef size_t size_type;
6767

68-
<del> size_t size() const;</del>
69-
<ins> size_t size() const noexcept;</ins>
70-
<del> iterator begin() const;</del>
71-
<ins> iterator begin() const noexcept;</ins>
72-
<del> iterator end() const;</del>
73-
<ins> iterator end() const noexcept;</ins>
68+
size_t size() const noexcept;
69+
iterator begin() const noexcept;
70+
iterator end() const noexcept;
7471

7572
private:
7673
std::list&lt;exception_ptr&gt; exceptions_; // exposition only
@@ -87,13 +84,13 @@ <h1>Exception reporting behavior</h1>
8784
</p>
8885

8986
<p>
90-
<ins>The type <code>exception_list::const_iterator</code> shall fulfill the requirements of
91-
<code>ForwardIterator</code></ins>.
87+
The type <code>exception_list::const_iterator</code> shall fulfill the requirements of
88+
<code>ForwardIterator</code>.
9289
</p>
9390

9491
<cxx-function>
9592
<cxx-signature>
96-
size_t size() const <ins>noexcept</ins>;
93+
size_t size() const noexcept;
9794
</cxx-signature>
9895

9996
<cxx-returns>
@@ -107,7 +104,7 @@ <h1>Exception reporting behavior</h1>
107104

108105
<cxx-function>
109106
<cxx-signature>
110-
exception_list::iterator begin() const <ins>noexcept</ins>;
107+
exception_list::iterator begin() const noexcept;
111108
</cxx-signature>
112109

113110
<cxx-returns>
@@ -117,7 +114,7 @@ <h1>Exception reporting behavior</h1>
117114

118115
<cxx-function>
119116
<cxx-signature>
120-
exception_list::iterator end() const <ins>noexcept</ins>;
117+
exception_list::iterator end() const noexcept;
121118
</cxx-signature>
122119

123120
<cxx-returns>

0 commit comments

Comments
 (0)