Merge github.com:cplusplus/parallelism-ts

Conflicts:
	bower_components/cxx-html-doc-framework/base.css

Author: jaredhoberock

algorithms.html

@@ -77,6 +77,17 @@ p:first-child, ul, ol {margin-top: 0}
 del {text-decoration: line-through; color: #8B0040;}
 ins {text-decoration: underline; color: #005100;}
 
+del2 {text-decoration: line-through; color: #FF0040; font-size:100%;}
+ins2 {text-decoration: underline; color: #FF0040; font-size:100%;}
+/* inserted in TS and then deleted for LWG */
+insdel {text-decoration: line-through; color: #FF4440; font-size:100%;}
+
+del3 {text-decoration: line-through; color: #006666; font-size:100%;}
+ins3 {text-decoration: underline; color: #00CC66; font-size:100%;}
+
+/* inserted in Rappersil and then deleted by another paper */
+insdel2 {text-decoration: line-through; color: #003366; font-size:100%;}
+
 pre {
     margin-left: 1em;
     margin-top: .5em;

bower_components/cxx-html-doc-framework/base.css

@@ -3,27 +3,27 @@ <h1>Parallel exceptions</h1>
     <cxx-section id="parallel.exceptions.behavior">
       <h1>Exception reporting behavior</h1>
         <p>
-          During the execution of a standard parallel algorithm, 
-          if temporary memory resources are required and none are available,
+          <ins2>During the execution of a standard parallel algorithm, </ins2>
+          <del2>I</del2><ins2>i</ins2>f temporary memory resources are required <del2>by the algorithm</del2> and none are available,
           the algorithm throws a <code>std::bad_alloc</code> exception.
         </p>
         <p>
-          During the execution of a standard parallel algorithm, if the <del>application of a function
-          object</del><ins>invocation of an element access function</ins> terminates with an uncaught
+          During the execution of a standard parallel algorithm, if the <del3>application of a function
+          object</del3><ins3>invocation of an element access function</ins> terminates with an uncaught
           exception, the behavior of the program is determined by the type of execution policy used to
           invoke the algorithm:
 
           <ul>
             <li>
-              If the execution policy object is of type <code>class parallel_vector_execution_policy</code>,
+              If the execution policy object is of type <code>class <del2>vector_execution_policy</del2><ins2>parallel_vector_execution_policy</ins2></code>,
               <code>std::terminate</code> shall be called.
             </li>
             <li>
               If the execution policy object is of type <code>sequential_execution_policy</code> or
               <code>parallel_execution_policy</code>, the execution of the algorithm terminates with an
               <code>exception_list</code> exception. All uncaught exceptions thrown during
-              the <del>application of user-provided function objects</del><ins>invocations of element access functions</ins>
-              shall be contained in the <code>exception_list</code>.<pre>
+              the <del3>application of user-provided function objects</del3><ins3>invocations of element
+              access functions</ins3> shall be contained in the <code>exception_list</code>.<pre>
 </pre>
 
               <cxx-note>
@@ -60,28 +60,41 @@ <h1>Header <code>&lt;experimental/exception_list&gt;</code> synopsis</h1>
 namespace std {
 namespace experimental {
 namespace parallel {
-inline namespace v1 {
+<ins2>inline namespace v1 {</ins2>
 
   class exception_list : public exception
   {
     public:
-      typedef <em>unspecified</em>                   iterator;
+      <del2>
+      typedef exception_ptr                                             value_type;
+      typedef const value_type&amp;                                         reference;
+      typedef const value_type&amp;                                         const_reference;
+      typedef <em>implementation-defined</em>                                    const_iterator;
+      typedef const_iterator                                            iterator;
+      typedef typename iterator_traits<ins2>&lt;const_iterator&gt;</ins2>::difference_type difference_type;
+      typedef size_t                                                    size_type;</del2>
+      <ins2>
+      typedef <em>unspecified</em>                   iterator;</ins2>
 
       size_t size() const noexcept;
       iterator begin() const noexcept;
       iterator end() const noexcept;
 
-      const char* what() const override noexcept;
+      <ins2>const char* what() const noexcept override;</ins2>
+  <del2>
+    private:
+      std::list&lt;exception_ptr&gt; exceptions_; // exposition only
+  </del2>
   };
-}
+<ins2>}</ins2>
 }
 }
 }
       </pre>
 
       <p>
-        The class <code>exception_list</code> owns a sequence of <code>exception_ptr</code> objects. The parallel
-        algorithms may use the <code>exception_list</code> to communicate uncaught exceptions encountered during parallel execution to the
+        The class <code>exception_list</code> <del2>is a container</del2> <ins2>owns a sequence</ins2> of <code>exception_ptr</code> objects <ins2>.The</ins2> parallel
+        algorithms may use <ins2>the <code>exception_list</code></ins2> to communicate uncaught exceptions encountered during parallel execution to the
         caller of the algorithm.
       </p>
 
@@ -106,7 +119,7 @@ <h1>Header <code>&lt;experimental/exception_list&gt;</code> synopsis</h1>
 
       <cxx-function>
         <cxx-signature>
-          iterator begin() const noexcept;
+          <del2>exception_list::</del2>iterator begin() const noexcept;
         </cxx-signature>
 
         <cxx-returns>
@@ -116,21 +129,21 @@ <h1>Header <code>&lt;experimental/exception_list&gt;</code> synopsis</h1>
 
       <cxx-function>
         <cxx-signature>
-          iterator end() const noexcept;
+          <del2>exception_list::</del2>iterator end() const noexcept;
         </cxx-signature>
 
         <cxx-returns>
-          An iterator that is past the end of the owned sequence.
+          An iterator <del2>which is the past-the-end value for the <code>exception_list</code></del2> <ins2>that is past the end of the owned sequence.</ins2>
         </cxx-returns>
       </cxx-function>
 
       <cxx-function>
         <cxx-signature>
-          const char* what() const noexcept override;
+          <ins2>const char* what() const noexcept override;</ins2>
         </cxx-signature>
 
         <cxx-returns>
-          An implementation-defined NTBS.
+          <ins2>An implementation-defined NTBS.</ins2>
         </cxx-returns>
       </cxx-function>
     </cxx-section>