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

[SVN r58618]

doc/html/fusion/view/zip_view.html

@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>zip_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="joint_view.html" title="joint_view">
@@ -22,6 +26,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="joint_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="transform_view.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="id523475"></a>
         <a href="zip_view.html#fusion.view.zip_view.description">Description</a>
       </h4>
+=======
+<div class="section" title="zip_view">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.view.zip_view"></a><a class="link" href="zip_view.html" title="zip_view">zip_view</a>
+</h3></div></div></div>
+<a name="fusion.view.zip_view.description"></a><h5>
+<a name="id731648"></a>
+        <a class="link" href="zip_view.html#fusion.view.zip_view.description">Description</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <p>
         <tt class="computeroutput"><span class="identifier">zip_view</span></tt> presents a view
         which iterates over a collection of <a href="../sequence.html" title="Sequence">Sequence</a>(s)
@@ -40,24 +55,45 @@
         constructed from a <a href="../sequence.html" title="Sequence">Sequence</a> of references
         to the component <span class="underline">_sequence</span>_s.
       </p>
+<<<<<<< .working
 <a name="fusion.view.zip_view.header"></a><h4>
 <a name="id523552"></a>
         <a href="zip_view.html#fusion.view.zip_view.header">Header</a>
       </h4>
+=======
+<a name="fusion.view.zip_view.header"></a><h5>
+<a name="id731695"></a>
+        <a class="link" href="zip_view.html#fusion.view.zip_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">zip_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">zip_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.view.zip_view.synopsis"></a><h4>
 <a name="id523707"></a>
         <a href="zip_view.html#fusion.view.zip_view.synopsis">Synopsis</a>
       </h4>
+=======
+<a name="fusion.view.zip_view.synopsis"></a><h5>
+<a name="id731803"></a>
+        <a class="link" href="zip_view.html#fusion.view.zip_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">Sequences</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">zip_view</span><span class="special">;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.view.zip_view.template_parameters"></a><h4>
 <a name="id523785"></a>
         <a href="zip_view.html#fusion.view.zip_view.template_parameters">Template parameters</a>
       </h4>
+=======
+<a name="fusion.view.zip_view.template_parameters"></a><h5>
+<a name="id731854"></a>
+        <a class="link" href="zip_view.html#fusion.view.zip_view.template_parameters">Template parameters</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -88,6 +124,7 @@
               </p></td>
 </tr></tbody>
 </table></div>
+<<<<<<< .working
 <a name="fusion.view.zip_view.model_of"></a><h4>
 <a name="id523904"></a>
         <a href="zip_view.html#fusion.view.zip_view.model_of">Model of</a>
@@ -99,6 +136,16 @@
         Sequence">Bidirectional
           Sequence</a> or <a href="../sequence/concepts/random_access_sequence.html" title="Random
         Access Sequence">Random
+=======
+<a name="fusion.view.zip_view.model_of"></a><h5>
+<a name="id731947"></a>
+        <a class="link" href="zip_view.html#fusion.view.zip_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.
@@ -121,10 +168,17 @@
           </p></dd>
 </dl>
 </div>
+<<<<<<< .working
 <a name="fusion.view.zip_view.expression_semantics"></a><h4>
 <a name="id524097"></a>
         <a href="zip_view.html#fusion.view.zip_view.expression_semantics">Expression Semantics</a>
       </h4>
+=======
+<a name="fusion.view.zip_view.expression_semantics"></a><h5>
+<a name="id732078"></a>
+        <a class="link" href="zip_view.html#fusion.view.zip_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
@@ -177,12 +231,21 @@
 </tr>
 </tbody>
 </table></div>
+<<<<<<< .working
 <a name="fusion.view.zip_view.example"></a><h4>
 <a name="id524404"></a>
         <a href="zip_view.html#fusion.view.zip_view.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">int</span><span class="special">&gt;</span> <span class="identifier">vec1</span><span class="special">;</span>
 <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">char</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec2</span><span class="special">;</span>
+=======
+<a name="fusion.view.zip_view.example"></a><h5>
+<a name="id732298"></a>
+        <a class="link" href="zip_view.html#fusion.view.zip_view.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">int</span><span class="special">&gt;</span> <span class="identifier">vec1</span><span class="special">;</span>
+<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">char</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec2</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
 <span class="identifier">vec1</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
 <span class="identifier">vec2</span> <span class="identifier">v2</span><span class="special">(</span><span class="char">'a'</span><span class="special">,</span><span class="char">'b'</span><span class="special">);</span>
 <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="identifier">vec1</span><span class="special">&amp;,</span> <span class="identifier">vec2</span><span class="special">&amp;&gt;</span> <span class="identifier">sequences</span><span class="special">;</span>