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

[SVN r58618]

doc/html/fusion/support/pair.html

@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>pair</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="../support.html" title="Support">
 <link rel="previous" href="deduce_sequence.html" title="deduce_sequence">
@@ -22,6 +26,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="deduce_sequence.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../support.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="../iterator.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,17 +38,33 @@
 <a name="id418183"></a>
         <a href="pair.html#fusion.support.pair.description">Description</a>
       </h4>
+=======
+<div class="section" title="pair">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.support.pair"></a><a class="link" href="pair.html" title="pair">pair</a>
+</h3></div></div></div>
+<a name="fusion.support.pair.description"></a><h5>
+<a name="id617959"></a>
+        <a class="link" href="pair.html#fusion.support.pair.description">Description</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <p>
         Fusion <tt class="computeroutput"><span class="identifier">pair</span></tt> type is a half
         runtime pair. A half runtime pair is similar to a <a href="../adapted/std__pair.html" title="std::pair"><tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt></a>,
         but, unlike <a href="../adapted/std__pair.html" title="std::pair"><tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt></a>,
-        the first type does not have data. It is used as elements in <span class="underline">_map</span>_s,
-        for example.
+        the first type does not have data. It is used as elements in <a class="link" href="../container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a>s, for example.
       </p>
+<<<<<<< .working
 <a name="fusion.support.pair.synopsis"></a><h4>
 <a name="id418285"></a>
         <a href="pair.html#fusion.support.pair.synopsis">Synopsis</a>
       </h4>
+=======
+<a name="fusion.support.pair.synopsis"></a><h5>
+<a name="id618026"></a>
+        <a class="link" href="pair.html#fusion.support.pair.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">First</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Second</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">pair</span><span class="special">;</span>
 
@@ -63,10 +84,17 @@
 <span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_pair</span><span class="special">&lt;</span><span class="identifier">First</span><span class="special">,</span><span class="identifier">Second</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">make_pair</span><span class="special">(</span><span class="identifier">Second</span> <span class="keyword">const</span> <span class="special">&amp;);</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.support.pair.template_parameters"></a><h4>
 <a name="id418690"></a>
         <a href="pair.html#fusion.support.pair.template_parameters">Template parameters</a>
       </h4>
+=======
+<a name="fusion.support.pair.template_parameters"></a><h5>
+<a name="id618322"></a>
+        <a class="link" href="pair.html#fusion.support.pair.template_parameters">Template parameters</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -130,10 +158,17 @@
           </p></dd>
 </dl>
 </div>
+<<<<<<< .working
 <a name="fusion.support.pair.expression_semantics"></a><h4>
 <a name="id418971"></a>
         <a href="pair.html#fusion.support.pair.expression_semantics">Expression Semantics</a>
       </h4>
+=======
+<a name="fusion.support.pair.expression_semantics"></a><h5>
+<a name="id618540"></a>
+        <a class="link" href="pair.html#fusion.support.pair.expression_semantics">Expression Semantics</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -258,17 +293,31 @@
 </tr>
 </tbody>
 </table></div>
+<<<<<<< .working
 <a name="fusion.support.pair.header"></a><h4>
 <a name="id419746"></a>
         <a href="pair.html#fusion.support.pair.header">Header</a>
       </h4>
+=======
+<a name="fusion.support.pair.header"></a><h5>
+<a name="id619127"></a>
+        <a class="link" href="pair.html#fusion.support.pair.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">support</span><span class="special">/</span><span class="identifier">pair</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">pair</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.support.pair.example"></a><h4>
 <a name="id419900"></a>
         <a href="pair.html#fusion.support.pair.example">Example</a>
       </h4>
+=======
+<a name="fusion.support.pair.example"></a><h5>
+<a name="id619235"></a>
+        <a class="link" href="pair.html#fusion.support.pair.example">Example</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">pair</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">p</span><span class="special">(</span><span class="char">'X'</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="identifier">p</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> <span class="identifier">make_pair</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="char">'X'</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>