Flatten diffs from the pre-Albuquerque paper

Author: jaredhoberock

algorithms.html

@@ -88,7 +88,6 @@ <h1>Effect of execution policies on algorithm execution</h1>
         incremented correctly.
       </cxx-example>
 
-      <ins>
       <p>
         The invocations of element access functions in parallel algorithms invoked with an
         execution policy of type <code>unsequenced_policy</code> are permitted to execute
@@ -106,9 +105,7 @@ <h1>Effect of execution policies on algorithm execution</h1>
           function executions do not interleave with one another.
         </cxx-note>
       </p>
-      </ins>
 
-      <ins>
       <p>
         The invocations of element access functions in parallel algorithms invoked with an
         executino policy of type <code>vector_policy</code> are permitted to execute
@@ -117,7 +114,6 @@ <h1>Effect of execution policies on algorithm execution</h1>
         (<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>
-      </ins>
 
       <p>
         The invocations of element access functions in parallel algorithms invoked with an execution
@@ -196,7 +192,6 @@ <h1>Effect of execution policies on algorithm execution</h1>
 
     <cxx-section id="parallel.alg.general.wavefront">
       <h1>Wavefront Application</h1>
-      <ins>
       <p>
         For the purposes of this section, an <i>evaluation</i> is a value computation or side effect of
         an expression, or an execution of a statement. Initialization of a temporary object is considered a
@@ -292,7 +287,6 @@ <h1>Wavefront Application</h1>
           The relationships between A<sub>i</sub> and B<sub>i</sub> and between A<sub>j</sub> and B<sub>j</sub> are <i>sequenced before</i>, not <i>vertical antecedent</i>.
         </cxx-note>
       </p>
-      </ins>
     </cxx-section>
 
     <cxx-section id="parallel.alg.overloads">
@@ -512,7 +506,7 @@ <h1>Header <code>&lt;experimental/algorithm&gt;</code> synopsis</h1>
                              InputIterator first, Size n,
                              Function f);
 
-<ins>namespace execution {
+namespace execution {
   <cxx-ref insynopsis="" to="parallel.alg.novec"></cxx-ref>
   template&lt;class F&gt;
     auto no_vec(F&amp;&amp; f) noexcept -&gt; decltype(std::forward&lt;F&gt;(f)());
@@ -524,7 +518,7 @@ <h1>Header <code>&lt;experimental/algorithm&gt;</code> synopsis</h1>
   <cxx-ref insynopsis="" to="parallel.alg.ordupdate.func"></cxx-ref>
   template&lt;class T&gt;
     ordered_update_t&lt;T&gt; ordered_update(T&amp; ref) noexcept;
-}</ins>
+}
 }
 }
 }
@@ -637,7 +631,6 @@ <h1>For each</h1>
     <cxx-section id="parallel.alg.novec">
       <h1>No vec</h1>
 
-      <ins>
       <cxx-function>
         <cxx-signature>template&lt;class F&gt;
 auto no_vec(F&amp;&amp; f) noexcept -&gt; decltype(std::forward&lt;F&gt;(f)());</cxx-signature>
@@ -678,13 +671,11 @@ <h1>No vec</h1>
           </cxx-example>
         </cxx-notes>
       </cxx-function>
-      </ins>
     </cxx-section>
 
     <cxx-section id="parallel.alg.ordupdate.class">
       <h1>Ordered update class</h1>
 
-      <ins>
 <pre>
 class ordered_update_t {
   T&amp; ref_; // exposition only
@@ -752,12 +743,10 @@ <h1>Ordered update class</h1>
           value.
         </cxx-note>
       </p>
-      </ins>
     </cxx-section>
 
     <cxx-section id="parallel.alg.ordupdate.func">
       <h1>Ordered update function template</h1>
-      <ins>
 
       <cxx-function>
         <cxx-signature>template&lt;T&gt;
@@ -768,7 +757,6 @@ <h1>Ordered update function template</h1>
         <code>{ loc }</code>.
       </cxx-returns>
 
-      </ins>
     </cxx-section>
   </cxx-section>
 

exceptions.html

@@ -14,7 +14,7 @@ <h1>Exception reporting behavior</h1>
 
           <ul>
             <li>
-              If the execution policy object is of type <code><del>class </del>parallel_vector_execution_policy</code><ins>, <code>unsequenced_policy</code>, or <code>vector_policy</code></ins>,
+              If the execution policy object is of type <code>parallel_vector_execution_policy</code>, <code>unsequenced_policy</code>, or <code>vector_policy</code>,
               <code>std::terminate</code> shall be called.
             </li>
             <li>

execution_policies.html

@@ -69,13 +69,13 @@ <h1>Header <code>&lt;experimental/execution_policy&gt;</code> synopsis</h1>
   <cxx-ref insynopsis="" to="parallel.execpol.dynamic"></cxx-ref>
   class execution_policy;
 
-<ins>namespace execution {
+namespace execution {
   <cxx-ref insynopsis="" to="parallel.execpol.unseq"></cxx-ref>
-  <ins>class unsequenced_policy;</ins>
+  class unsequenced_policy;
 
   <cxx-ref insynopsis="" to="parallel.execpol.vec"></cxx-ref>
-  <ins>class vector_policy;</ins>
-}</ins>
+  class vector_policy;
+}
 }
 }
 }
@@ -135,28 +135,24 @@ <h1>Parallel+Vector execution policy</h1>
 
   <cxx-section id="parallel.execpol.unseq">
     <h1>Unsequenced execution policy</h1>
-<ins>
 
 <pre>
 class unsequenced_policy{ <i>unspecified</i> };
 </pre>
 
     <p>The class <code>unsequenced_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, e.g., executed on a single thread using instructions that operate on multiple data items.</p>
 
-</ins>
   </cxx-section>
 
   <cxx-section id="parallel.execpol.vec">
     <h1>Vector execution policy</h1>
-<ins>
 
 <pre>
 class vector_policy{ <i>unspecified</i> };
 </pre>
 
     <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>
 
-</ins>
   </cxx-section>
 
   <cxx-section id="parallel.execpol.dynamic">

general.html

@@ -31,38 +31,6 @@ <h1>Namespaces and headers</h1>
     <h1>Feature-testing recommendations</h1>     
     <p>An implementation that provides support for this Technical Specification shall define the feature test macro(s) in Table 1.</p>
 
-    <del>
-    <table is="cxx-table" class="column-rules">
-      <caption>Feature Test Macro(s)</caption>
-
-      <thead>
-        <tr>
-          <th>Name</th>
-          <th>Value</th>
-          <th>Header</th>
-        </tr>
-        <tr>
-          <td><code>__cpp_lib_experimental_parallel_algorithm</code></td>
-          <td>201505</td>
-          <td>
-            <code>&lt;experimental/algorithm&gt;</code><br>
-            <code>&lt;experimental/exception_list&gt;</code><br>
-            <code>&lt;experimental/execution_policy&gt;</code><br>
-            <code>&lt;experimental/numeric&gt;</code>
-          </td>
-        </tr>
-        <tr>
-          <td><code>__cpp_lib_experimental_parallel_task_block</code></td>
-          <td>201510</td>
-          <td>
-            <code>&lt;experimental/task_block&gt;</code><br>
-          </td>
-        </tr>
-      </thead>
-    </table>
-    </del>
-
-    <ins>
     <table is="cxx-table" class="column-rules">
       <caption>Feature Test Macro(s)</caption>
 
@@ -111,7 +79,6 @@ <h1>Feature-testing recommendations</h1>
         </tr>
       </thead>
     </table>
-    <ins>
   </cxx-section>
 </cxx-clause>