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

[SVN r58618]

doc/html/fusion/adapted/boost__array.html

@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>boost::array</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="mpl_sequence.html" title="mpl sequence">
@@ -36,24 +40,46 @@
         Access Sequence">Random
         Access Sequence</a>.
       </p>
+<<<<<<< .working
 <a name="fusion.adapted.boost__array.header"></a><h4>
 <a name="id532132"></a>
         <a href="boost__array.html#fusion.adapted.boost__array.header">Header</a>
       </h4>
+=======
+<a name="fusion.adapted.boost__array.header"></a><h5>
+<a name="id739972"></a>
+        <a class="link" href="boost__array.html#fusion.adapted.boost__array.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">array</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">array</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.boost__array.model_of"></a><h4>
 <a name="id532287"></a>
         <a href="boost__array.html#fusion.adapted.boost__array.model_of">Model of</a>
       </h4>
 <div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/random_access_sequence.html" title="Random
         Access Sequence">Random
+=======
+<a name="fusion.adapted.boost__array.model_of"></a><h5>
+<a name="id740080"></a>
+        <a class="link" href="boost__array.html#fusion.adapted.boost__array.model_of">Model of</a>
+      </h5>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+>>>>>>> .merge-right.r57125
           Access Sequence</a></li></ul></div>
+<<<<<<< .working
 <a name="fusion.adapted.boost__array.example"></a><h4>
 <a name="id532327"></a>
         <a href="boost__array.html#fusion.adapted.boost__array.example">Example</a>
       </h4>
+=======
+<a name="fusion.adapted.boost__array.example"></a><h5>
+<a name="id740105"></a>
+        <a class="link" href="boost__array.html#fusion.adapted.boost__array.example">Example</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="number">3</span><span class="special">&gt;</span> <span class="identifier">arr</span> <span class="special">=</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="number">3</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><a href="../sequence/intrinsic/functions/begin.html" title="begin"><tt class="computeroutput"><span class="identifier">begin</span></tt></a><span class="special">(</span><span class="identifier">arr</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>
@@ -62,10 +88,17 @@
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span><a href="../iterator/functions/prior.html" title="prior"><tt class="computeroutput"><span class="identifier">prior</span></tt></a><span class="special">(</span><a href="../sequence/intrinsic/functions/end.html" title="end"><tt class="computeroutput"><span class="identifier">end</span></tt></a><span class="special">(</span><span class="identifier">arr</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">2</span><span class="special">&gt;(</span><span class="identifier">arr</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.boost__array.see_also"></a><h4>
 <a name="id532945"></a>
         <a href="boost__array.html#fusion.adapted.boost__array.see_also">See also</a>
       </h4>
+=======
+<a name="fusion.adapted.boost__array.see_also"></a><h5>
+<a name="id740541"></a>
+        <a class="link" href="boost__array.html#fusion.adapted.boost__array.see_also">See also</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <p>
         <a href="http://www.boost.org/doc/html/array.html" target="_top">Boost.Array Library</a>
       </p>