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

[SVN r58618]

doc/html/fusion/support/deduce.html

@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>deduce</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="../support.html" title="Support">
 <link rel="previous" href="category_of.html" title="category_of">
@@ -22,6 +26,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="category_of.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="deduce_sequence.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="id416406"></a>
         <a href="deduce.html#fusion.support.deduce.description">Description</a>
       </h4>
+=======
+<div class="section" title="deduce">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.support.deduce"></a><a class="link" href="deduce.html" title="deduce">deduce</a>
+</h3></div></div></div>
+<a name="fusion.support.deduce.description"></a><h5>
+<a name="id616706"></a>
+        <a class="link" href="deduce.html#fusion.support.deduce.description">Description</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <p>
         Metafunction to apply <a href="../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
         conversion</em></span></a> to the full argument type.
@@ -42,17 +57,31 @@
         references to array types are kept, even if the array is <tt class="computeroutput"><span class="keyword">const</span></tt>.
         Reference wrappers are removed (see <a href="../notes.html#fusion.notes.boost__ref"><tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">ref</span></tt></a>).
       </p>
+<<<<<<< .working
 <a name="fusion.support.deduce.header"></a><h4>
 <a name="id416503"></a>
         <a href="deduce.html#fusion.support.deduce.header">Header</a>
       </h4>
+=======
+<a name="fusion.support.deduce.header"></a><h5>
+<a name="id616763"></a>
+        <a class="link" href="deduce.html#fusion.support.deduce.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">deduce</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">deduce</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.support.deduce.synopsis"></a><h4>
 <a name="id416658"></a>
         <a href="deduce.html#fusion.support.deduce.synopsis">Synopsis</a>
       </h4>
+=======
+<a name="fusion.support.deduce.synopsis"></a><h5>
+<a name="id616871"></a>
+        <a class="link" href="deduce.html#fusion.support.deduce.synopsis">Synopsis</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">traits</span>
 <span class="special">{</span>
     <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
@@ -62,10 +91,17 @@
     <span class="special">};</span>
 <span class="special">}</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.support.deduce.example"></a><h4>
 <a name="id416787"></a>
         <a href="deduce.html#fusion.support.deduce.example">Example</a>
       </h4>
+=======
+<a name="fusion.support.deduce.example"></a><h5>
+<a name="id616965"></a>
+        <a class="link" href="deduce.html#fusion.support.deduce.example">Example</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">T</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">holder</span>
 <span class="special">{</span>
@@ -82,11 +118,19 @@
     <span class="keyword">return</span> <span class="identifier">holder</span><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;(</span><span class="identifier">a</span><span class="special">);</span>
 <span class="special">}</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.support.deduce.see_also"></a><h4>
 <a name="id417150"></a>
         <a href="deduce.html#fusion.support.deduce.see_also">See also</a>
       </h4>
 <div class="itemizedlist"><ul type="disc"><li><a href="deduce_sequence.html" title="deduce_sequence"><tt class="computeroutput"><span class="identifier">deduce_sequence</span></tt></a></li></ul></div>
+=======
+<a name="fusion.support.deduce.see_also"></a><h5>
+<a name="id617233"></a>
+        <a class="link" href="deduce.html#fusion.support.deduce.see_also">See also</a>
+      </h5>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="deduce_sequence.html" title="deduce_sequence"><code class="computeroutput"><span class="identifier">deduce_sequence</span></code></a></li></ul></div>
+>>>>>>> .merge-right.r57125
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>