Flatten post-Urbana diffs

Author: jaredhoberock

algorithms.html

@@ -35,10 +35,9 @@ <h1>Effect of execution policies on algorithm execution</h1>
       <p>
         The invocations of element access functions in parallel algorithms invoked with an execution
         policy object of type <code>parallel_execution_policy</code> are permitted to execute in an
-        unordered fashion in <del>unspecified threads</del><ins>either the invoking thread or in a
-        thread implicitly created by the library to support parallel algorithm execution.</ins>
-        <del>, and</del> <ins>Any such invocations executing in the same thread are</ins> indeterminately
-        sequenced <del>within each thread</del><ins>with respect to each other</ins>. 
+        unordered fashion in either the invoking thread or in a thread implicitly created by the library
+        to support parallel algorithm execution. Any such invocations executing in the same thread are
+        indeterminately sequenced with respect to each other. 
 
         <cxx-note>
           It is the caller's responsibility to ensure correctness, for example that the invocation does
@@ -296,9 +295,9 @@ <h1><code>ExecutionPolicy</code> algorithm overloads</h1>
             <td><code>transform</code></td>
           </tr>
           <tr>
-            <td><code><ins>transform_exclusive_scan</ins></code></td>
-            <td><code><ins>transform_inclusive_scan</ins></code></td>
-            <td><code><ins>transform_reduce</ins></code></td>
+            <td><code>transform_exclusive_scan</code></td>
+            <td><code>transform_inclusive_scan</code></td>
+            <td><code>transform_reduce</code></td>
             <td><code>uninitialized_copy</code></td>
           </tr>
           <tr>
@@ -540,7 +539,6 @@ <h1>Header <code>&lt;experimental/numeric&gt;</code> synopsis</h1>
                      OutputIterator result,
                      BinaryOperation binary_op, T init);
 
-  <ins>
   template&lt;class InputIterator, class UnaryOperation,
            class T, class BinaryOperation&gt;
     T transform_reduce(InputIterator first, InputIterator last,
@@ -570,7 +568,6 @@ <h1>Header <code>&lt;experimental/numeric&gt;</code> synopsis</h1>
                                OutputIterator result,
                                UnaryOperation unary_op,
                                BinaryOperation binary_op, T init);
-  </ins>
 }
 }
 }
@@ -753,35 +750,25 @@ <h1>Transform reduce</h1>
 
       <cxx-function>
         <cxx-signature>
-        <ins>
           template&lt;class InputIterator, class UnaryFunction, class T, class BinaryOperation&gt;
           T transform_reduce(InputIterator first, InputIterator last,
                              UnaryOperation unary_op, T init, BinaryOperation binary_op);
-        </ins>
         </cxx-signature>
 
         <cxx-returns>
-        <ins>
           <code><em>GENERALIZED_SUM</em>(binary_op, init, unary_op(*first), ..., unary_op(*(first + (last - first) - 1)))</code>.
-        </ins>
         </cxx-returns>
 
         <cxx-requires>
-        <ins>
           Neither <code>unary_op</code> nor <code>binary_op</code> shall invalidate subranges, or modify elements in the range <code>[first,last)</code>
-        </ins>
         </cxx-requires>
 
         <cxx-complexity>
-        <ins>
           O(<code>last - first</code>) applications each of <code>unary_op</code> and <code>binary_op</code>.
-        </ins>
         </cxx-complexity>
 
         <cxx-notes>
-        <ins>
           <code>transform_reduce</code> does not apply <code>unary_op</code> to <code>init</code>.
-        </ins>
         </cxx-notes>
       </cxx-function>
     </cxx-section>
@@ -791,7 +778,6 @@ <h1>Transform exclusive scan</h1>
 
       <cxx-function>
         <cxx-signature>
-        <ins>
           template&lt;class InputIterator, class OutputIterator,
                    class UnaryOperation,
                    class T, class BinaryOperation&gt;
@@ -800,41 +786,30 @@ <h1>Transform exclusive scan</h1>
                                        OutputIterator result,
                                        UnaryOperation unary_op,
                                        T init, BinaryOperation binary_op);
-        </ins>
         </cxx-signature>
 
         <cxx-effects>
-        <ins>
           Assigns through each iterator <code>i</code> in <code>[result,result + (last - first))</code> the value of
           <code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(binary_op, init, unary_op(*first), ..., unary_op(*(first + (i - result) - 1)))</code>.
-        </ins>
         </cxx-effects>
 
         <cxx-returns>
-        <ins>
           The end of the resulting range beginning at <code>result</code>.
-        </ins>
         </cxx-returns>
 
         <cxx-requires>
-        <ins>
           Neither <code>unary_op</code> nor <code>binary_op</code> shall invalidate iterators or subranges, or modify elements in the
           ranges <code>[first,last)</code> or <code>[result,result + (last - first))</code>.
-        </ins>
         </cxx-requires>
 
         <cxx-complexity>
-        <ins>
           O(<code>last - first</code>) applications each of <code>unary_op</code> and <code>binary_op</code>.
-        </ins>
         </cxx-complexity>
 
         <cxx-notes>
-        <ins>
           The difference between <code>transform_exclusive_scan</code> and <code>transform_inclusive_scan</code> is that <code>transform_exclusive_scan</code>
           excludes the ith input element from the ith sum. If <code>binary_op</code> is not mathematically associative, the behavior of
           <code>transform_exclusive_scan</code> may be non-deterministic. <code>transform_exclusive_scan</code> does not apply <code>unary_op</code> to <code>init</code>.
-        </ins>
         </cxx-notes>
       </cxx-function>
     </cxx-section>
@@ -844,7 +819,6 @@ <h1>Transform inclusive scan</h1>
 
       <cxx-function>
         <cxx-signature>
-        <ins>
           template&lt;class InputIterator, class OutputIterator,
                    class UnaryOperation,
                    class BinaryOperation&gt;
@@ -862,43 +836,32 @@ <h1>Transform inclusive scan</h1>
                                        OutputIterator result,
                                        UnaryOperation unary_op,
                                        BinaryOperation binary_op, T init);
-        </ins>
         </cxx-signature>
 
         <cxx-effects>
-        <ins>
           Assigns through each iterator <code>i</code> in <code>[result,result + (last - first))</code> the value of
           <code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(binary_op, unary_op(*first), ..., unary_op(*(first + (i - result))))</code> or
           <code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(binary_op, init, unary_op(*first), ..., unary_op(*(first + (i - result))))</code>
           if <code>init</code> is provided.
-        </ins>
         </cxx-effects>
 
         <cxx-returns>
-        <ins>
           The end of the resulting range beginning at <code>result</code>.
-        </ins>
         </cxx-returns>
 
         <cxx-requires>
-        <ins>
           Neither <code>unary_op</code> nor <code>binary_op</code> shall invalidate iterators or subranges, or modify elements in the ranges <code>[first,last)</code>
           or <code>[result,result + (last - first))</code>.
-        </ins>
         </cxx-requires>
 
         <cxx-complexity>
-        <ins>
           O(<code>last - first</code>) applications each of <code>unary_op</code> and <code>binary_op</code>.
-        </ins>
         </cxx-complexity>
 
         <cxx-notes>
-        <ins>
-            The difference between <code>transform_exclusive_scan</code> and <code>transform_inclusive_scan</code> is that <code>transform_inclusive_scan</code>
-            includes the ith input element from the ith sum. If <code>binary_op</code> is not mathematically associative, the behavior of
-            <code>transform_inclusive_scan</code> may be non-deterministic. <code>transform_inclusive_scan</code> does not apply <code>unary_op</code> to <code>init</code>.
-        </ins>
+          The difference between <code>transform_exclusive_scan</code> and <code>transform_inclusive_scan</code> is that <code>transform_inclusive_scan</code>
+          includes the ith input element from the ith sum. If <code>binary_op</code> is not mathematically associative, the behavior of
+          <code>transform_inclusive_scan</code> may be non-deterministic. <code>transform_inclusive_scan</code> does not apply <code>unary_op</code> to <code>init</code>.
         </cxx-notes>
       </cxx-function>
     </cxx-section>

execution_policies.html

@@ -4,17 +4,16 @@ <h1>Execution policies</h1>
     <h1>In general</h1>
       <p>
         This clause describes classes that are <dfn>execution policy</dfn> types. An object
-        of an execution policy type indicates <ins>the kinds of parallelism allowed in the execution
-        of</ins> <del>to</del> an algorithm <del>whether it is allowed to execute
-        in parallel</del> and expresses the <ins>consequent</ins> requirements on the element
+        of an execution policy type indicates the kinds of parallelism allowed in the execution
+        of an algorithm and expresses the consequent requirements on the element
         access functions.
       </p>
 
       <cxx-example>
     <pre>std::vector&lt;int&gt; v = ...
 
 // standard sequential sort
-std::sort(v<del>ec</del>.begin(), v<del>ec</del>.end());
+std::sort(v.begin(), v.end());
 
 using namespace std::experimental::parallel;
 
@@ -89,11 +88,9 @@ <h1>Execution policy type trait</h1>
     <pre>
 </pre>
 
-    <ins>
-      <cxx-note>
-        This provision reserves the privilege of creating non-standard execution policies to the library implementation.
-      </cxx-note>
-    </ins>
+    <cxx-note>
+      This provision reserves the privilege of creating non-standard execution policies to the library implementation.
+    </cxx-note>
 
     <p>The behavior of a program that adds specializations for <code>is_execution_policy</code> is undefined.</p>
   </cxx-section>

front_matter.html

@@ -1,8 +1,8 @@
 <cxx-titlepage stage="draft">
-<cxx-docnum>N4310</cxx-docnum>
+<cxx-docnum>NXXX</cxx-docnum>
 <cxx-project-number>19570</cxx-project-number>
-  <time pubdate="">2014-11-21</time>
-  <cxx-revises><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4104.html">N4104</a></cxx-revises>
+  <time pubdate="">2015-01-06</time>
+  <cxx-revises><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4310.html">N4310</a></cxx-revises>
   <cxx-editor>
     Jared Hoberock<br/>
     NVIDIA Corporation<br/>

general.html

@@ -48,7 +48,7 @@ <h1>Normative references</h1>
   <cxx-section id="parallel.general.namespaces">
     <h1>Namespaces and headers</h1>
 
-    <p>Since the <del>the</del> extensions described in this Technical Specification are
+    <p>Since the extensions described in this Technical Specification are
     experimental and not part of the C++ Standard Library, they should not be
     declared directly within namespace <code>std</code>. Unless otherwise specified, all
     components described in this Technical Specification are declared in namespace