fusion: merge of associative iterators/views and the new fold interface

[SVN r58618]

doc/html/fusion/view/transform_view.html

@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>transform_view</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../view.html" title="View">
 <link rel="previous" href="zip_view.html" title="zip_view">
@@ -38,17 +42,31 @@
         inherits the traversal characteristics (see <a href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence
         Traversal Concept</a>) of its underlying sequence or sequences.
       </p>
+<<<<<<< .working
 <a name="fusion.view.transform_view.header"></a><h4>
 <a name="id524861"></a>
         <a href="transform_view.html#fusion.view.transform_view.header">Header</a>
       </h4>
+=======
+<a name="fusion.view.transform_view.header"></a><h5>
+<a name="id732614"></a>
+        <a class="link" href="transform_view.html#fusion.view.transform_view.header">Header</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">view</span><span class="special">/</span><span class="identifier">transform_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">transform_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.view.transform_view.synopsis"></a><h4>
 <a name="id525017"></a>
         <a href="transform_view.html#fusion.view.transform_view.synopsis">Synopsis</a>
       </h4>
+=======
+<a name="fusion.view.transform_view.synopsis"></a><h5>
+<a name="id732722"></a>
+        <a class="link" href="transform_view.html#fusion.view.transform_view.synopsis">Synopsis</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <p>
         <span class="bold"><b>Unary Version</b></span>
       </p>
@@ -61,10 +79,17 @@
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence2</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">F2</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">transform_view</span><span class="special">;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.view.transform_view.template_parameters"></a><h4>
 <a name="id525221"></a>
         <a href="transform_view.html#fusion.view.transform_view.template_parameters">Template parameters</a>
       </h4>
+=======
+<a name="fusion.view.transform_view.template_parameters"></a><h5>
+<a name="id732868"></a>
+        <a class="link" href="transform_view.html#fusion.view.transform_view.template_parameters">Template parameters</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -147,6 +172,7 @@
 </tr>
 </tbody>
 </table></div>
+<<<<<<< .working
 <a name="fusion.view.transform_view.model_of"></a><h4>
 <a name="id525686"></a>
         <a href="transform_view.html#fusion.view.transform_view.model_of">Model of</a>
@@ -158,6 +184,16 @@
         Sequence">Bidirectional
           Sequence</a> or <a href="../sequence/concepts/random_access_sequence.html" title="Random
         Access Sequence">Random
+=======
+<a name="fusion.view.transform_view.model_of"></a><h5>
+<a name="id733216"></a>
+        <a class="link" href="transform_view.html#fusion.view.transform_view.model_of">Model of</a>
+      </h5>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
+<a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>,
+          <a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+          Sequence</a> or <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+>>>>>>> .merge-right.r57125
           Access Sequence</a> depending on the traversal characteristics (see
           <a href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence Traversal Concept</a>)
           of its underlying sequence.
@@ -206,9 +242,15 @@
           </p></dd>
 </dl>
 </div>
+<<<<<<< .working
 <a name="fusion.view.transform_view.expression_semantics"></a><h4>
 <a name="id526088"></a>
         <a href="transform_view.html#fusion.view.transform_view.expression_semantics">Expression
+=======
+<a name="fusion.view.transform_view.expression_semantics"></a><h5>
+<a name="id733498"></a>
+        <a class="link" href="transform_view.html#fusion.view.transform_view.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
         Semantics</a>
       </h4>
 <p>
@@ -281,10 +323,17 @@
 </tr>
 </tbody>
 </table></div>
+<<<<<<< .working
 <a name="fusion.view.transform_view.example"></a><h4>
 <a name="id526566"></a>
         <a href="transform_view.html#fusion.view.transform_view.example">Example</a>
       </h4>
+=======
+<a name="fusion.view.transform_view.example"></a><h5>
+<a name="id733832"></a>
+        <a class="link" href="transform_view.html#fusion.view.transform_view.example">Example</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">square</span>
 <span class="special">{</span>
     <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sig</span><span class="special">&gt;</span>