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

[SVN r58618]
2010-01-01 22:00:21 +00:00
parent b605617c4f
commit cda74605fc
379 changed files with 28481 additions and 2185 deletions
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>cons</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="vector.html" title="vector">
@@ -22,6 +26,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="vector.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="list.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="id481484"></a>
        <a href="cons.html#fusion.container.cons.description">Description</a>
      </h4>
+=======
+<div class="section" title="cons">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.container.cons"></a><a class="link" href="cons.html" title="cons">cons</a>
+</h3></div></div></div>
+<a name="fusion.container.cons.description"></a><h5>
+<a name="id687663"></a>
+        <a class="link" href="cons.html#fusion.container.cons.description">Description</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <p>
        <tt class="computeroutput"><span class="identifier">cons</span></tt> is a simple <a href="../sequence/concepts/forward_sequence.html" title="Forward
        Sequence">Forward
@@ -45,24 +60,45 @@
        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.cons.header"></a><h4>
 <a name="id481626"></a>
        <a href="cons.html#fusion.container.cons.header">Header</a>
      </h4>
+=======
+<a name="fusion.container.cons.header"></a><h5>
+<a name="id687744"></a>
+        <a class="link" href="cons.html#fusion.container.cons.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">cons</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">cons</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.container.cons.synopsis"></a><h4>
 <a name="id481791"></a>
        <a href="cons.html#fusion.container.cons.synopsis">Synopsis</a>
      </h4>
+=======
+<a name="fusion.container.cons.synopsis"></a><h5>
+<a name="id687860"></a>
+        <a class="link" href="cons.html#fusion.container.cons.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">Car</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Cdr</span> <span class="special">=</span> <span class="identifier">nil</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">cons</span><span class="special">;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.container.cons.template_parameters"></a><h4>
 <a name="id481898"></a>
        <a href="cons.html#fusion.container.cons.template_parameters">Template parameters</a>
      </h4>
+=======
+<a name="fusion.container.cons.template_parameters"></a><h5>
+<a name="id687934"></a>
+        <a class="link" href="cons.html#fusion.container.cons.template_parameters">Template parameters</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -104,6 +140,7 @@
 </tr>
 </tbody>
 </table></div>
+<<<<<<< .working
 <a name="fusion.container.cons.model_of"></a><h4>
 <a name="id482046"></a>
        <a href="cons.html#fusion.container.cons.model_of">Model of</a>
@@ -111,6 +148,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.cons.model_of"></a><h5>
+<a name="id688054"></a>
+        <a class="link" href="cons.html#fusion.container.cons.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">nil</span></tt></span></dt>
@@ -146,10 +191,17 @@
          </p></dd>
 </dl>
 </div>
+<<<<<<< .working
 <a name="fusion.container.cons.expression_semantics"></a><h4>
 <a name="id482328"></a>
        <a href="cons.html#fusion.container.cons.expression_semantics">Expression Semantics</a>
      </h4>
+=======
+<a name="fusion.container.cons.expression_semantics"></a><h5>
+<a name="id688258"></a>
+        <a class="link" href="cons.html#fusion.container.cons.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
@@ -248,11 +300,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.cons.example"></a><h4>
 <a name="id482977"></a>
        <a href="cons.html#fusion.container.cons.example">Example</a>
      </h4>
+=======
+      </p>
+</div>
+<a name="fusion.container.cons.example"></a><h5>
+<a name="id688721"></a>
+        <a class="link" href="cons.html#fusion.container.cons.example">Example</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">cons</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="identifier">cons</span><span class="special">&lt;</span><span class="keyword">float</span><span class="special">&gt;</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="identifier">cons</span><span class="special">&lt;</span><span class="keyword">float</span><span class="special">&gt;(</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>