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

[SVN r58618]

doc/html/fusion/adapted/boost__tuple.html

@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>boost::tuple</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="../adapted.html" title="Adapted">
 <link rel="previous" href="boost__array.html" title="boost::array">
@@ -36,13 +40,21 @@
         Sequence">Forward
         Sequence</a>.
       </p>
+<<<<<<< .working
 <a name="fusion.adapted.boost__tuple.header"></a><h4>
 <a name="id533058"></a>
         <a href="boost__tuple.html#fusion.adapted.boost__tuple.header">Header</a>
       </h4>
+=======
+<a name="fusion.adapted.boost__tuple.header"></a><h5>
+<a name="id740610"></a>
+        <a class="link" href="boost__tuple.html#fusion.adapted.boost__tuple.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">boost_tuple</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">boost_tuple</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.boost__tuple.model_of"></a><h4>
 <a name="id533213"></a>
         <a href="boost__tuple.html#fusion.adapted.boost__tuple.model_of">Model of</a>
@@ -53,14 +65,32 @@
 <a name="id533252"></a>
         <a href="boost__tuple.html#fusion.adapted.boost__tuple.example">Example</a>
       </h4>
+=======
+<a name="fusion.adapted.boost__tuple.model_of"></a><h5>
+<a name="id740718"></a>
+        <a class="link" href="boost__tuple.html#fusion.adapted.boost__tuple.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>
+<a name="fusion.adapted.boost__tuple.example"></a><h5>
+<a name="id740744"></a>
+        <a class="link" href="boost__tuple.html#fusion.adapted.boost__tuple.example">Example</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">tuple</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="identifier">example_tuple</span><span class="special">(</span><span class="number">101</span><span class="special">,</span> <span class="string">"hello"</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> <span class="special">*</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">begin</span><span class="special">(</span><span class="identifier">example_tuple</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="char">'\n'</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> <span class="special">*</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">next</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">begin</span><span class="special">(</span><span class="identifier">example_tuple</span><span class="special">))</span> <span class="special">&lt;&lt;</span> <span class="char">'\n'</span><span class="special">;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.boost__tuple.see_also"></a><h4>
 <a name="id533568"></a>
         <a href="boost__tuple.html#fusion.adapted.boost__tuple.see_also">See also</a>
       </h4>
+=======
+<a name="fusion.adapted.boost__tuple.see_also"></a><h5>
+<a name="id740970"></a>
+        <a class="link" href="boost__tuple.html#fusion.adapted.boost__tuple.see_also">See also</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <p>
         <a href="http://www.boost.org/libs/tuple/doc/tuple_users_guide.html" target="_top">Boost.Tuple
         Library</a>