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

[SVN r58618]

doc/html/fusion/adapted/mpl_sequence.html

@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>mpl sequence</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<65>1.<2E>Fusion 2.0">
 <link rel="up" href="../adapted.html" title="Adapted">
 <link rel="previous" href="std__pair.html" title="std::pair">
@@ -34,13 +38,21 @@
         sequences. Including the module header makes all <a href="http://www.boost.org/libs/mpl/index.html" target="_top">MPL</a>
         sequences fully conforming fusion sequences.
       </p>
+<<<<<<< .working
 <a name="fusion.adapted.mpl_sequence.header"></a><h4>
 <a name="id531191"></a>
         <a href="mpl_sequence.html#fusion.adapted.mpl_sequence.header">Header</a>
       </h4>
+=======
+<a name="fusion.adapted.mpl_sequence.header"></a><h5>
+<a name="id738223"></a>
+        <a class="link" href="mpl_sequence.html#fusion.adapted.mpl_sequence.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">adapted</span><span class="special">/</span><span class="identifier">mpl</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">mpl</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.mpl_sequence.model_of"></a><h4>
 <a name="id531346"></a>
         <a href="mpl_sequence.html#fusion.adapted.mpl_sequence.model_of">Model of</a>
@@ -49,6 +61,15 @@
 <li>
 <a href="../sequence/concepts/forward_sequence.html" title="Forward
         Sequence">Forward Sequence</a>
+=======
+<a name="fusion.adapted.mpl_sequence.model_of"></a><h5>
+<a name="id738331"></a>
+        <a class="link" href="mpl_sequence.html#fusion.adapted.mpl_sequence.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>
+>>>>>>> .merge-right.r57125
           (If the <a href="http://www.boost.org/libs/mpl/index.html" target="_top">MPL</a>
           sequence is a forward sequence.)
         </li>
@@ -65,10 +86,17 @@
           sequence is a random access sequence.)
         </li>
 </ul></div>
+<<<<<<< .working
 <a name="fusion.adapted.mpl_sequence.example"></a><h4>
 <a name="id531436"></a>
         <a href="mpl_sequence.html#fusion.adapted.mpl_sequence.example">Example</a>
       </h4>
+=======
+<a name="fusion.adapted.mpl_sequence.example"></a><h5>
+<a name="id739482"></a>
+        <a class="link" href="mpl_sequence.html#fusion.adapted.mpl_sequence.example">Example</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><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">123</span><span class="special">,</span> <span class="number">456</span><span class="special">&gt;</span> <span class="identifier">vec_c</span><span class="special">;</span>
 <span class="identifier">fusion</span><span class="special">::</span><span class="identifier">vector2</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">long</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="identifier">vec_c</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">v</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>
@@ -78,10 +106,17 @@
 <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">v</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">v</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>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.mpl_sequence.see_also"></a><h4>
 <a name="id532022"></a>
         <a href="mpl_sequence.html#fusion.adapted.mpl_sequence.see_also">See also</a>
       </h4>
+=======
+<a name="fusion.adapted.mpl_sequence.see_also"></a><h5>
+<a name="id739902"></a>
+        <a class="link" href="mpl_sequence.html#fusion.adapted.mpl_sequence.see_also">See also</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <p>
         <a href="http://www.boost.org/libs/mpl/index.html" target="_top">MPL</a>
       </p>