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

[SVN r58618]

doc/html/fusion/container/list.html

@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>list</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="../container.html" title="Container">
 <link rel="previous" href="cons.html" title="cons">
@@ -22,6 +26,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="cons.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../container.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="set.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="id483306"></a>
         <a href="list.html#fusion.container.list.description">Description</a>
       </h4>
+=======
+<div class="section" title="list">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.container.list"></a><a class="link" href="list.html" title="list">list</a>
+</h3></div></div></div>
+<a name="fusion.container.list.description"></a><h5>
+<a name="id688953"></a>
+        <a class="link" href="list.html#fusion.container.list.description">Description</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <p>
         <tt class="computeroutput"><span class="identifier">list</span></tt> is a <a href="../sequence/concepts/forward_sequence.html" title="Forward
         Sequence">Forward
@@ -41,19 +56,33 @@
         when the target sequence is constructed piecemeal (a data at a time). The
         runtime cost of access to each element is peculiarly constant (see <a href="../notes.html#fusion.notes.recursive_inlined_functions">Recursive Inlined Functions</a>).
       </p>
+<<<<<<< .working
 <a name="fusion.container.list.header"></a><h4>
 <a name="id483401"></a>
         <a href="list.html#fusion.container.list.header">Header</a>
       </h4>
+=======
+<a name="fusion.container.list.header"></a><h5>
+<a name="id689006"></a>
+        <a class="link" href="list.html#fusion.container.list.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">container</span><span class="special">/</span><span class="identifier">list</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">list</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">container</span><span class="special">/</span><span class="identifier">list</span><span class="special">/</span><span class="identifier">list_fwd</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">list_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.container.list.synopsis"></a><h4>
 <a name="id483692"></a>
         <a href="list.html#fusion.container.list.synopsis">Synopsis</a>
       </h4>
+=======
+<a name="fusion.container.list.synopsis"></a><h5>
+<a name="id689212"></a>
+        <a class="link" href="list.html#fusion.container.list.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">T0</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span>
   <span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span>
@@ -78,10 +107,17 @@
       </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_LIST_SIZE</span> <span class="number">20</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.container.list.template_parameters"></a><h4>
 <a name="id484018"></a>
         <a href="list.html#fusion.container.list.template_parameters">Template parameters</a>
       </h4>
+=======
+<a name="fusion.container.list.template_parameters"></a><h5>
+<a name="id690538"></a>
+        <a class="link" href="list.html#fusion.container.list.template_parameters">Template parameters</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -111,6 +147,7 @@
               </p></td>
 </tr></tbody>
 </table></div>
+<<<<<<< .working
 <a name="fusion.container.list.model_of"></a><h4>
 <a name="id484136"></a>
         <a href="list.html#fusion.container.list.model_of">Model of</a>
@@ -118,6 +155,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.container.list.model_of"></a><h5>
+<a name="id690631"></a>
+        <a class="link" href="list.html#fusion.container.list.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">L</span></tt></span></dt>
@@ -144,10 +189,17 @@
           </p></dd>
 </dl>
 </div>
+<<<<<<< .working
 <a name="fusion.container.list.expression_semantics"></a><h4>
 <a name="id484349"></a>
         <a href="list.html#fusion.container.list.expression_semantics">Expression Semantics</a>
       </h4>
+=======
+<a name="fusion.container.list.expression_semantics"></a><h5>
+<a name="id690785"></a>
+        <a class="link" href="list.html#fusion.container.list.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
@@ -227,11 +279,20 @@
         Access Sequence">Random
         Access Sequence</a> requirement). The runtime complexity of <a href="../sequence/intrinsic/functions/at.html" title="at"><tt class="computeroutput"><span class="identifier">at</span></tt></a> is constant (see <a href="../notes.html#fusion.notes.recursive_inlined_functions">Recursive
         Inlined Functions</a>).
+<<<<<<< .working
       </p></div>
 <a name="fusion.container.list.example"></a><h4>
 <a name="id484925"></a>
         <a href="list.html#fusion.container.list.example">Example</a>
       </h4>
+=======
+      </p>
+</div>
+<a name="fusion.container.list.example"></a><h5>
+<a name="id691189"></a>
+        <a class="link" href="list.html#fusion.container.list.example">Example</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">list</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">l</span><span class="special">(</span><span class="number">12</span><span class="special">,</span> <span class="number">5.5f</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> <a href="../sequence/intrinsic/functions/at_c.html" title="at_c"><tt class="computeroutput"><span class="identifier">at_c</span></tt></a><span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</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>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a href="../sequence/intrinsic/functions/at_c.html" title="at_c"><tt class="computeroutput"><span class="identifier">at_c</span></tt></a><span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</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>