Skip to content

Commit 35cb28f

Browse files
committed
Apply editorial corrections
Fixes #53
1 parent 383a4c0 commit 35cb28f

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

algorithms.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ <h1>Wavefront Application</h1>
8383
<p>
8484
Let <i>f</i> be a function called for each argument list in a sequence of argument lists.
8585
<i>Wavefront application</i> of <i>f</i> requires that evaluation A<sub>i</sub> be sequenced
86-
before evaluation B<sub>i</sub> if i &lt; j and and:
86+
before evaluation B<sub><ins>j</ins><del>i</del></sub> if i &lt; j and and:
8787

8888
<ul>
8989
<li>A<sub>i</sub> is sequenced before some evaluation B<sub>i</sub> and B<sub>i</sub> is horizontally matched with B<sub>j</sub>, or</li>
@@ -128,7 +128,7 @@ <h1>Header <code>&lt;experimental/algorithm&gt;</code> synopsis</h1>
128128

129129
// Exposition only: Suppress template argument deduction.
130130
template&lt;class T&gt; struct no_deduce { using type = T; };
131-
template&lt;class T&gt; struct no_dedude_t = typename no_deduce&lt;T&gt;::type;
131+
template&lt;class T&gt; struct no_dedu<ins>c</ins><del>d</del>e_t = typename no_deduce&lt;T&gt;::type;
132132

133133
<cxx-ref insynopsis="" to="parallel.alg.reductions"></cxx-ref> Support for reductions
134134
template&lt;class T, class BinaryOperation&gt;
@@ -288,7 +288,7 @@ <h1>Reductions</h1>
288288
</thead>
289289
</table>
290290

291-
<cxx-example>The following code updates each element of <code>y</code> and sets <code>s</code> ot the sum of the squares.
291+
<cxx-example>The following code updates each element of <code>y</code> and sets <code>s</code> <ins>to</ins><del>ot</del> the sum of the squares.
292292
<pre>
293293
extern int n;
294294
extern float x[], y[], a;
@@ -333,7 +333,7 @@ <h1>Inductions</h1>
333333
<em>unspecified</em> induction(T&amp;&amp; var, S stride);</cxx-signature>
334334

335335
<cxx-returns>
336-
an induction object with induction value type <code>remove_cv_t&gt;remove_reference_t&gt;T&lt;&lt;</code>,
336+
an induction object with induction value type <code>remove_cv_t<ins>&lt;</ins><del>&gt;</del>remove_reference_t<ins>&lt;</ins><del>&gt;</del>T<ins>&gt;&gt;</ins><del>&lt;&lt;</del></code>,
337337
initial value <code>var</code>, and (if specified) stride <code>stride</code>. If <code>T</code> is an lvalue reference
338338
to non-<code>const</code> type, then the object referenced by <code>var</code> becomes the live-out object for the
339339
induction object; otherwise there is no live-out object.
@@ -425,13 +425,13 @@ <h1>For loop</h1>
425425
The first element in the input sequence is <code>start</code>. Each subsequent element is generated by adding
426426
<code>stride</code> to the previous element, if <code>stride</code> is specified, otherwise by incrementing
427427
the previous element. <cxx-note>As described in the C++ standard, section [algorithms.general], arithmetic
428-
on non-random-access iterators is performed using advance and distance.</cxx-note> <cxx-note>The order of the
428+
on non-random-access iterators is performed using <ins><code>advance</code></ins><del>advance</del> and <ins><code>distance</code></ins><del>distance</del>.</cxx-note> <cxx-note>The order of the
429429
elements of the input sequence is important for determining ordinal position of an application of <em>f</em>,
430430
even though the applications themselves may be unordered.</cxx-note></p>
431431

432432
The first argument to <em>f</em> is an element from the input sequence. <cxx-note>if <code>I</code> is an
433433
iterator type, the iterators in the input sequence are not dereferenced before
434-
being passed to <em>f</em>.</cxx-note> For each member of the rest parameter pack
434+
being passed to <em>f</em>.</cxx-note> For each member of the <ins><code>rest</code></ins><del>rest</del> parameter pack
435435
excluding <em>f</em>, an additional argument is passed to each application of <em>f</em> as follows:
436436

437437
<ul>

exceptions.html

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

2929
<p>
30-
The type <code>exception_list::iterator</code> shall fulfill the requirements of
30+
The type <code>exception_list::iterator</code> <ins>fulfills</ins><del>shall fulfill</del> the requirements of
3131
<code>ForwardIterator</code>.
3232
</p>
3333

execution_policies.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h1>Header <code>&lt;experimental/execution&gt;</code> synopsis</h1>
1818

1919
<cxx-ref insynopsis="" to="parallel.execpol.objects"></cxx-ref>
2020
inline constexpr unsequenced_policy unseq{ <i>unspecified</i> };
21-
inline constexpr parallel_policy par{ <i>unspecified</i> };
21+
inline constexpr <ins>vector_policy vec</ins><del>parallel_policy par</del>{ <i>unspecified</i> };
2222
}
2323
}
2424
}
@@ -39,7 +39,7 @@ <h1>Unsequenced execution policy</h1>
3939

4040
<p><cxx-note>This overrides the usual guarantee from the C++ Standard, <cxx-ref in="cxx" to="intro.execution"></cxx-ref> [intro.execution] that function executions do not overlap with one another.</cxx-note></p>
4141

42-
<p>During the execution of a parallel algorithm with the <code>experimental::execution::unsequenced_policy</code> policy, if the invocation of an element access function exits via an uncaught exception, <code>terminate()</code> shall be called.</p>
42+
<p>During the execution of a parallel algorithm with the <code>experimental::execution::unsequenced_policy</code> policy, if the invocation of an element access function exits via an uncaught exception, <code>terminate()</code> <ins>will</ins><del>shall</del> be called.</p>
4343

4444
</cxx-section>
4545

@@ -52,9 +52,9 @@ <h1>Vector execution policy</h1>
5252

5353
<p>The class <code>vector_policy</code> is an execution policy type used as a unique type to disambiguate parallel algorithm overloading and indicate that a parallel algorithm's execution may be vectorized. Additionally, such vectorization will result in an execution that respects the sequencing constraints of wavefront application ([parallel.alg.general.wavefront]). <cxx-note>The implementation thus makes stronger guarantees than for <code>unsequenced_policy</code>, for example.</cxx-note></p>
5454

55-
<p>The invocations of element access functions in parallel algorithms invoked with an execution policy of type <code>vector_policy</code> are permitted to execute in unordered fashion in the calling thread, unsequenced with respect to one another within the calling thread, subject to the sequencing constraints of wavefront application (<cxx-ref to="parallel.alg.general.wavefront"></cxx-ref>) for the last argument to <code>for_loop</code> or <code>for_loop_strided</code>.</p>
55+
<p>The invocations of element access functions in parallel algorithms invoked with an execution policy of type <code>vector_policy</code> are permitted to execute in unordered fashion in the calling thread, unsequenced with respect to one another within the calling thread, subject to the sequencing constraints of wavefront application (<cxx-ref to="parallel.alg.general.wavefront"></cxx-ref>) for the last argument to <code>for_loop</code><ins>, for_loop_n,</ins> <del>or </del><code>for_loop_strided</code><ins>, or <code>for_loop_strided_n</code>.</p>
5656

57-
<p>During the execution of a parallel algorithm with the <code>experimental::execution::vector_policy</code> policy, if the invocation of an element access function exits via an uncaught exception, <code>terminate()</code> shall be called.</p>
57+
<p>During the execution of a parallel algorithm with the <code>experimental::execution::vector_policy</code> policy, if the invocation of an element access function exits via an uncaught exception, <code>terminate()</code> <ins>will</ins><del>shall</del> be called.</p>
5858

5959
</cxx-section>
6060

0 commit comments

Comments
 (0)