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

[SVN r58618]

doc/html/fusion/view/nview.html

@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>nview</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="reverse_view.html" title="reverse_view">
@@ -22,6 +26,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="reverse_view.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../view.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../adapted.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
+<<<<<<< .working
 <div class="section" lang="en">
 <div class="titlepage">
 <div><div><h3 class="title">
@@ -33,6 +38,16 @@
 <a name="id528240"></a>
         <a href="nview.html#fusion.view.nview.description">Description</a>
       </h4>
+=======
+<div class="section" title="nview">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.view.nview"></a><a class="link" href="nview.html" title="nview">nview</a>
+</h3></div></div></div>
+<a name="fusion.view.nview.description"></a><h5>
+<a name="id735048"></a>
+        <a class="link" href="nview.html#fusion.view.nview.description">Description</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <p>
         <tt class="computeroutput"><span class="identifier">nview</span></tt> presents a view which
         iterates over a given <a href="../sequence.html" title="Sequence">Sequence</a> in
@@ -40,17 +55,31 @@
         is constructed from an arbitrary <a href="../sequence.html" title="Sequence">Sequence</a>
         and a list of indicies specifying the elements to iterate over.
       </p>
+<<<<<<< .working
 <a name="fusion.view.nview.header"></a><h4>
 <a name="id528309"></a>
         <a href="nview.html#fusion.view.nview.header">Header</a>
       </h4>
+=======
+<a name="fusion.view.nview.header"></a><h5>
+<a name="id735089"></a>
+        <a class="link" href="nview.html#fusion.view.nview.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">nview</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">nview</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.view.nview.synopsis"></a><h4>
 <a name="id528464"></a>
         <a href="nview.html#fusion.view.nview.synopsis">Synopsis</a>
       </h4>
+=======
+<a name="fusion.view.nview.synopsis"></a><h5>
+<a name="id736290"></a>
+        <a class="link" href="nview.html#fusion.view.nview.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">Sequence</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Indicies</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">nview</span><span class="special">;</span>
 
@@ -58,10 +87,17 @@
 <span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">nview</span><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">I1</span><span class="special">,</span> <span class="identifier">I2</span><span class="special">,</span> <span class="special">...&gt;::</span><span class="identifier">type</span>
 <span class="identifier">as_nview</span><span class="special">(</span><span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">);</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.view.nview.template_parameters"></a><h4>
 <a name="id528750"></a>
         <a href="nview.html#fusion.view.nview.template_parameters">Template parameters</a>
       </h4>
+=======
+<a name="fusion.view.nview.template_parameters"></a><h5>
+<a name="id736497"></a>
+        <a class="link" href="nview.html#fusion.view.nview.template_parameters">Template parameters</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -116,6 +152,7 @@
 </tr>
 </tbody>
 </table></div>
+<<<<<<< .working
 <a name="fusion.view.nview.model_of"></a><h4>
 <a name="id529035"></a>
         <a href="nview.html#fusion.view.nview.model_of">Model of</a>
@@ -124,6 +161,15 @@
 <a href="../sequence/concepts/random_access_sequence.html" title="Random
         Access Sequence">Random
           Access Sequence</a> (see <a href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence
+=======
+<a name="fusion.view.nview.model_of"></a><h5>
+<a name="id736711"></a>
+        <a class="link" href="nview.html#fusion.view.nview.model_of">Model of</a>
+      </h5>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
+<a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+          Access Sequence</a> (see <a class="link" href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence
+>>>>>>> .merge-right.r57125
           Traversal Concept</a>)
         </li></ul></div>
 <div class="variablelist">
@@ -144,10 +190,17 @@
           </p></dd>
 </dl>
 </div>
+<<<<<<< .working
 <a name="fusion.view.nview.expression_semantics"></a><h4>
 <a name="id529208"></a>
         <a href="nview.html#fusion.view.nview.expression_semantics">Expression Semantics</a>
       </h4>
+=======
+<a name="fusion.view.nview.expression_semantics"></a><h5>
+<a name="id736831"></a>
+        <a class="link" href="nview.html#fusion.view.nview.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/random_access_sequence.html" title="Random
@@ -205,11 +258,19 @@
         a Fusion <a href="../container/vector.html" title="vector"><tt class="computeroutput"><span class="identifier">vector</span></tt></a>
         of references to the elements of the original Fusion <a href="../sequence.html" title="Sequence">Sequence</a>
       </p>
+<<<<<<< .working
 <a name="fusion.view.nview.example"></a><h4>
 <a name="id529549"></a>
         <a href="nview.html#fusion.view.nview.example">Example</a>
       </h4>
 <pre class="programlisting"><span class="keyword">typedef</span> <a href="../container/vector.html" title="vector"><tt class="computeroutput"><span class="identifier">vector</span></tt></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
+=======
+<a name="fusion.view.nview.example"></a><h5>
+<a name="id737073"></a>
+        <a class="link" href="nview.html#fusion.view.nview.example">Example</a>
+      </h5>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
 <span class="keyword">typedef</span> <span class="identifier">mpl</span><span class="special">::</span><span class="identifier">vector_c</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">1</span><span class="special">,</span> <span class="number">0</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">0</span><span class="special">&gt;</span> <span class="identifier">indicies</span><span class="special">;</span>
 
 <span class="identifier">vec</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'c'</span><span class="special">,</span> <span class="number">2.0</span><span class="special">);</span>