Merge pull request #15 from jaredhoberock/master

Fix inclusive_scan's general signature & eliminate innermost namespace

Author: jaredhoberock

algorithms.html

@@ -362,7 +362,6 @@ <h1>Header <code>&lt;experimental/algorithm&gt;</code> synopsis</h1>
 namespace std {
 namespace experimental {
 <ins2>inline</ins2> namespace parallel<ins2>_v1</ins2> {
-<ins2>namespace parallel {</ins2>
   template&lt;class ExecutionPolicy,
            class InputIterator, class Function&gt;
     void for_each(ExecutionPolicy&amp;&amp; exec,
@@ -371,7 +370,6 @@ <h1>Header <code>&lt;experimental/algorithm&gt;</code> synopsis</h1>
   template&lt;class InputIterator, class Size, class Function&gt;
     InputIterator for_each_n(InputIterator first, Size n,
                              Function f);
-<ins2>}</ins2>
 }
 }
 }
@@ -503,7 +501,6 @@ <h1>Header <code>&lt;experimental/numeric&gt;</code><ins2> synopsis</ins2></h1>
 namespace std {
 namespace experimental {
 <ins2>inline</ins2> namespace parallel<ins2>_v1</ins2> {
-<ins2>namespace parallel {</ins2>
   template&lt;class InputIterator&gt;
     typename iterator_traits&lt;InputIterator&gt;::value_type
       reduce(InputIterator first, InputIterator last);
@@ -543,12 +540,11 @@ <h1>Header <code>&lt;experimental/numeric&gt;</code><ins2> synopsis</ins2></h1>
                      OutputIterator result,
                      BinaryOperation binary_op);
   template&lt;class InputIterator, class OutputIterator,
-           class T, class BinaryOperation&gt;
+           <del2>class T, </del2>class BinaryOperation<ins2>, class T</ins2>&gt;
     OutputIterator
       inclusive_scan(InputIterator first, InputIterator last,
                      OutputIterator result,
-                     T init, BinaryOperation binary_op);
-<ins2>}</ins2>
+                     <del2>T init, </del2>BinaryOperation binary_op<ins2>, T init</ins2>);
 }
 }
 }
@@ -787,11 +783,11 @@ <h1>Inclusive scan</h1>
                              BinaryOperation binary_op);
 
           template&lt;class InputIterator, class OutputIterator,
-                   class T, class BinaryOperation&gt;
+                   <del2>class T, </del2>class BinaryOperation<ins2>, class T</ins2>&gt;
             OutputIterator
               inclusive_scan(InputIterator first, InputIterator last,
                              OutputIterator result,
-                             T init, BinaryOperation binary_op);
+                             <del2>T init, </del2>BinaryOperation binary_op<ins2>, T init</ins2>);
         </cxx-signature>
 
         <cxx-effects>

exceptions.html

@@ -59,7 +59,6 @@ <h1>Header <code>&lt;experimental/exception_list&gt;</code> synopsis</h1>
 namespace std {
 namespace experimental {
 <ins2>inline</ins2> namespace parallel<ins2>_v1</ins2> {
-<ins2>namespace parallel {</ins2>
 
   class exception_list : public exception
   {
@@ -85,7 +84,6 @@ <h1>Header <code>&lt;experimental/exception_list&gt;</code> synopsis</h1>
       std::list&lt;exception_ptr&gt; exceptions_; // exposition only
   </del2>
   };
-<ins2>}</ins2>
 }
 }
 }

execution_policies.html

@@ -61,7 +61,6 @@ <h1>Header <code>&lt;experimental/execution_policy&gt;</code> synopsis</h1>
 namespace std {
 namespace experimental {
 <ins2>inline</ins2> namespace parallel<ins2>_v1</ins2> {
-<ins2>namespace parallel {</ins2>
   <cxx-ref insynopsis="" to="parallel.execpol.type"></cxx-ref>
   template&lt;class T&gt; struct is_execution_policy;
   <ins2>template&lt;class T&gt; constexpr bool is_execution_policy_v = is_execution_policy&lt;T&gt;::value;</ins2>
@@ -77,7 +76,6 @@ <h1>Header <code>&lt;experimental/execution_policy&gt;</code> synopsis</h1>
 
   <cxx-ref insynopsis="" to="parallel.execpol.dynamic"></cxx-ref>
   class execution_policy;
-<ins2>}</ins2>
 }
 }
 }