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

[SVN r58618]

doc/html/fusion/view/single_view.html

@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>single_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="../view.html" title="View">
@@ -33,24 +37,45 @@
         <tt class="computeroutput"><span class="identifier">single_view</span></tt> is a view into
         a value as a single element sequence.
       </p>
+<<<<<<< .working
 <a name="fusion.view.single_view.header"></a><h4>
 <a name="id353110"></a>
         <a href="single_view.html#fusion.view.single_view.header">Header</a>
       </h4>
+=======
+<a name="fusion.view.single_view.header"></a><h5>
+<a name="id722947"></a>
+        <a class="link" href="single_view.html#fusion.view.single_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">single_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">single_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.view.single_view.synopsis"></a><h4>
 <a name="id518175"></a>
         <a href="single_view.html#fusion.view.single_view.synopsis">Synopsis</a>
       </h4>
+=======
+<a name="fusion.view.single_view.synopsis"></a><h5>
+<a name="id723055"></a>
+        <a class="link" href="single_view.html#fusion.view.single_view.synopsis">Synopsis</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">single_view</span><span class="special">;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.view.single_view.template_parameters"></a><h4>
 <a name="id518253"></a>
         <a href="single_view.html#fusion.view.single_view.template_parameters">Template parameters</a>
       </h4>
+=======
+<a name="fusion.view.single_view.template_parameters"></a><h5>
+<a name="id723107"></a>
+        <a class="link" href="single_view.html#fusion.view.single_view.template_parameters">Template parameters</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -79,6 +104,7 @@
               </p></td>
 </tr></tbody>
 </table></div>
+<<<<<<< .working
 <a name="fusion.view.single_view.model_of"></a><h4>
 <a name="id518355"></a>
         <a href="single_view.html#fusion.view.single_view.model_of">Model of</a>
@@ -86,6 +112,14 @@
 <div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/forward_sequence.html" title="Forward
         Sequence">Forward Sequence</a></li></ul></div>
 <div class="variablelist">
+=======
+<a name="fusion.view.single_view.model_of"></a><h5>
+<a name="id723190"></a>
+        <a class="link" href="single_view.html#fusion.view.single_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></li></ul></div>
+<div class="variablelist" title="Notation">
+>>>>>>> .merge-right.r57125
 <p class="title"><b>Notation</b></p>
 <dl>
 <dt><span class="term"><tt class="computeroutput"><span class="identifier">S</span></tt></span></dt>
@@ -103,10 +137,17 @@
           </p></dd>
 </dl>
 </div>
+<<<<<<< .working
 <a name="fusion.view.single_view.expression_semantics"></a><h4>
 <a name="id518518"></a>
         <a href="single_view.html#fusion.view.single_view.expression_semantics">Expression Semantics</a>
       </h4>
+=======
+<a name="fusion.view.single_view.expression_semantics"></a><h5>
+<a name="id723305"></a>
+        <a class="link" href="single_view.html#fusion.view.single_view.expression_semantics">Expression Semantics</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <p>
         Semantics of an expression is defined only where it differs from, or is not
         defined in <a href="../sequence/concepts/forward_sequence.html" title="Forward
@@ -159,10 +200,17 @@
 </tr>
 </tbody>
 </table></div>
+<<<<<<< .working
 <a name="fusion.view.single_view.example"></a><h4>
 <a name="id518828"></a>
         <a href="single_view.html#fusion.view.single_view.example">Example</a>
       </h4>
+=======
+<a name="fusion.view.single_view.example"></a><h5>
+<a name="id723528"></a>
+        <a class="link" href="single_view.html#fusion.view.single_view.example">Example</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">single_view</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">view</span><span class="special">(</span><span class="number">3</span><span class="special">);</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">view</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 </pre>