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

[SVN r58618]

doc/html/fusion/support/is_view.html

@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>is_view</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="is_sequence.html" title="is_sequence">
@@ -22,6 +26,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="is_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="tag_of.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="id413272"></a>
         <a href="is_view.html#fusion.support.is_view.description">Description</a>
       </h4>
+=======
+<div class="section" title="is_view">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.support.is_view"></a><a class="link" href="is_view.html" title="is_view">is_view</a>
+</h3></div></div></div>
+<a name="fusion.support.is_view.description"></a><h5>
+<a name="id613016"></a>
+        <a class="link" href="is_view.html#fusion.support.is_view.description">Description</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <p>
         Metafunction that evaluates to <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>
         if a certain type <tt class="computeroutput"><span class="identifier">T</span></tt> is a
@@ -43,10 +58,17 @@
         reference. <tt class="computeroutput"><span class="identifier">is_view</span></tt> may be
         specialized to accomodate clients providing Fusion conforming views.
       </p>
+<<<<<<< .working
 <a name="fusion.support.is_view.synopsis"></a><h4>
 <a name="id413366"></a>
         <a href="is_view.html#fusion.support.is_view.synopsis">Synopsis</a>
       </h4>
+=======
+<a name="fusion.support.is_view.synopsis"></a><h5>
+<a name="id613080"></a>
+        <a class="link" href="is_view.html#fusion.support.is_view.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>
@@ -56,10 +78,17 @@
     <span class="special">};</span>
 <span class="special">}</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.support.is_view.parameters"></a><h4>
 <a name="id413482"></a>
         <a href="is_view.html#fusion.support.is_view.parameters">Parameters</a>
       </h4>
+=======
+<a name="fusion.support.is_view.parameters"></a><h5>
+<a name="id613174"></a>
+        <a class="link" href="is_view.html#fusion.support.is_view.parameters">Parameters</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -89,10 +118,17 @@
               </p></td>
 </tr></tbody>
 </table></div>
+<<<<<<< .working
 <a name="fusion.support.is_view.expression_semantics"></a><h4>
 <a name="id413581"></a>
         <a href="is_view.html#fusion.support.is_view.expression_semantics">Expression Semantics</a>
       </h4>
+=======
+<a name="fusion.support.is_view.expression_semantics"></a><h5>
+<a name="id613257"></a>
+        <a class="link" href="is_view.html#fusion.support.is_view.expression_semantics">Expression Semantics</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_view</span><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">c</span><span class="special">;</span>
 </pre>
 <p>
@@ -105,17 +141,31 @@
         is a conforming Fusion view, <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></tt>
         otherwise.
       </p>
+<<<<<<< .working
 <a name="fusion.support.is_view.header"></a><h4>
 <a name="id413730"></a>
         <a href="is_view.html#fusion.support.is_view.header">Header</a>
       </h4>
+=======
+<a name="fusion.support.is_view.header"></a><h5>
+<a name="id613371"></a>
+        <a class="link" href="is_view.html#fusion.support.is_view.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">is_view</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">is_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.support.is_view.example"></a><h4>
 <a name="id413867"></a>
         <a href="is_view.html#fusion.support.is_view.example">Example</a>
       </h4>
+=======
+<a name="fusion.support.is_view.example"></a><h5>
+<a name="id613479"></a>
+        <a class="link" href="is_view.html#fusion.support.is_view.example">Example</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_view</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="special">));</span>
 <span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_view</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="special">));</span>