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

[SVN r58618]
This commit is contained in:
Christopher Schmidt
2010-01-01 22:00:21 +00:00
parent b605617c4f
commit cda74605fc
379 changed files with 28481 additions and 2185 deletions

View File

@ -3,7 +3,11 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title> Callable Object</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="../concepts.html" title="Concepts">
<link rel="previous" href="../concepts.html" title="Concepts">
@ -23,6 +27,7 @@
<div class="spirit-nav">
<a accesskey="p" href="../concepts.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.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="reg_callable.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@ -34,17 +39,36 @@
<a name="id609740"></a>
<a href="callable.html#fusion.functional.concepts.callable.description">Description</a>
</h5>
=======
<div class="section" title="Callable Object">
<div class="titlepage"><div><div><h4 class="title">
<a name="fusion.functional.concepts.callable"></a><a class="link" href="callable.html" title="Callable Object"> Callable Object</a>
</h4></div></div></div>
<a name="fusion.functional.concepts.callable.description"></a><h6>
<a name="id816649"></a>
<a class="link" href="callable.html#fusion.functional.concepts.callable.description">Description</a>
</h6>
>>>>>>> .merge-right.r57125
<p>
A pointer to a function, a pointer to member function, a pointer to member
data, or a class type whose objects can appear immediately to the left
of a function call operator.
</p>
<<<<<<< .working
<a name="fusion.functional.concepts.callable.models"></a><h5>
<a name="id609771"></a>
<a href="callable.html#fusion.functional.concepts.callable.models">Models</a>
</h5>
<div class="itemizedlist"><ul type="disc">
<li>
=======
<a name="fusion.functional.concepts.callable.models"></a><h6>
<a name="id816666"></a>
<a class="link" href="callable.html#fusion.functional.concepts.callable.models">Models</a>
</h6>
<div class="itemizedlist"><ul class="itemizedlist" type="disc">
<li class="listitem">
>>>>>>> .merge-right.r57125
function pointer types
</li>
<li>
@ -54,10 +78,17 @@
all kinds of function objects
</li>
</ul></div>
<<<<<<< .working
<a name="fusion.functional.concepts.callable.examples"></a><h5>
<a name="id609812"></a>
<a href="callable.html#fusion.functional.concepts.callable.examples">Examples</a>
</h5>
=======
<a name="fusion.functional.concepts.callable.examples"></a><h6>
<a name="id816695"></a>
<a class="link" href="callable.html#fusion.functional.concepts.callable.examples">Examples</a>
</h6>
>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="special">&amp;</span> <span class="identifier">a_free_function</span>
<span class="special">&amp;</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_static_member_function</span>
<span class="special">&amp;</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_nonstatic_data_member</span>

View File

@ -4,7 +4,11 @@
<title> Deferred
Callable Object</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="../concepts.html" title="Concepts">
<link rel="previous" href="reg_callable.html" title=" Regular Callable
@ -31,6 +35,7 @@
<a name="fusion.functional.concepts.def_callable"></a><a href="def_callable.html" title=" Deferred
Callable Object"> Deferred
Callable Object</a>
<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@ -38,14 +43,27 @@
<a name="id610834"></a>
<a href="def_callable.html#fusion.functional.concepts.def_callable.description">Description</a>
</h5>
=======
</h4></div></div></div>
<a name="fusion.functional.concepts.def_callable.description"></a><h6>
<a name="id817426"></a>
<a class="link" href="def_callable.html#fusion.functional.concepts.def_callable.description">Description</a>
</h6>
>>>>>>> .merge-right.r57125
<p>
<a href="callable.html" title=" Callable Object">Callable Object</a>
types that work with <a href="http://www.boost.org/libs/utility/utility.htm#result_of" target="_top">Boost.ResultOf</a>
to determine the result of a call.
</p>
<<<<<<< .working
<a name="fusion.functional.concepts.def_callable.refinement_of"></a><h5>
<a name="id610880"></a>
<a href="def_callable.html#fusion.functional.concepts.def_callable.refinement_of">Refinement
=======
<a name="fusion.functional.concepts.def_callable.refinement_of"></a><h6>
<a name="id817452"></a>
<a class="link" href="def_callable.html#fusion.functional.concepts.def_callable.refinement_of">Refinement
>>>>>>> .merge-right.r57125
of</a>
</h5>
<div class="itemizedlist"><ul type="disc"><li><a href="callable.html" title=" Callable Object">Callable Object</a></li></ul></div>
@ -84,9 +102,15 @@
</p></dd>
</dl>
</div>
<<<<<<< .working
<a name="fusion.functional.concepts.def_callable.expression_requirements"></a><h5>
<a name="id611182"></a>
<a href="def_callable.html#fusion.functional.concepts.def_callable.expression_requirements">Expression
=======
<a name="fusion.functional.concepts.def_callable.expression_requirements"></a><h6>
<a name="id817667"></a>
<a class="link" href="def_callable.html#fusion.functional.concepts.def_callable.expression_requirements">Expression
>>>>>>> .merge-right.r57125
requirements</a>
</h5>
<div class="informaltable"><table class="table">
@ -114,6 +138,7 @@
</p></td>
</tr></tbody>
</table></div>
<<<<<<< .working
<a name="fusion.functional.concepts.def_callable.models"></a><h5>
<a name="id611364"></a>
<a href="def_callable.html#fusion.functional.concepts.def_callable.models">Models</a>
@ -122,16 +147,32 @@
<li>
<a href="poly.html" title=" Polymorphic Function
Object">Polymorphic Function
=======
<a name="fusion.functional.concepts.def_callable.models"></a><h6>
<a name="id820004"></a>
<a class="link" href="def_callable.html#fusion.functional.concepts.def_callable.models">Models</a>
</h6>
<div class="itemizedlist"><ul class="itemizedlist" type="disc">
<li class="listitem">
<a class="link" href="poly.html" title="Polymorphic Function Object">Polymorphic Function
>>>>>>> .merge-right.r57125
Object</a> types
</li>
<li>
member (function or data) pointer types
</li>
</ul></div>
<<<<<<< .working
<a name="fusion.functional.concepts.def_callable.examples"></a><h5>
<a name="id611409"></a>
<a href="def_callable.html#fusion.functional.concepts.def_callable.examples">Examples</a>
</h5>
=======
<a name="fusion.functional.concepts.def_callable.examples"></a><h6>
<a name="id820034"></a>
<a class="link" href="def_callable.html#fusion.functional.concepts.def_callable.examples">Examples</a>
</h6>
>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="special">&amp;</span> <span class="identifier">a_free_function</span>
<span class="special">&amp;</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_static_member_function</span>
<span class="special">&amp;</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_nonstatic_data_member</span>

View File

@ -4,7 +4,11 @@
<title> Polymorphic Function
Object</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="../concepts.html" title="Concepts">
<link rel="previous" href="def_callable.html" title=" Deferred
@ -30,6 +34,7 @@
<a name="fusion.functional.concepts.poly"></a><a href="poly.html" title=" Polymorphic Function
Object"> Polymorphic Function
Object</a>
<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@ -37,14 +42,27 @@
<a name="id611708"></a>
<a href="poly.html#fusion.functional.concepts.poly.description">Description</a>
</h5>
=======
</h4></div></div></div>
<a name="fusion.functional.concepts.poly.description"></a><h6>
<a name="id820240"></a>
<a class="link" href="poly.html#fusion.functional.concepts.poly.description">Description</a>
</h6>
>>>>>>> .merge-right.r57125
<p>
A non-member-pointer <a href="def_callable.html" title=" Deferred
Callable Object">Deferred
Callable Object</a> type.
</p>
<<<<<<< .working
<a name="fusion.functional.concepts.poly.refinement_of"></a><h5>
<a name="id611746"></a>
<a href="poly.html#fusion.functional.concepts.poly.refinement_of">Refinement
=======
<a name="fusion.functional.concepts.poly.refinement_of"></a><h6>
<a name="id820262"></a>
<a class="link" href="poly.html#fusion.functional.concepts.poly.refinement_of">Refinement
>>>>>>> .merge-right.r57125
of</a>
</h5>
<div class="itemizedlist"><ul type="disc">
@ -86,9 +104,15 @@
</p></dd>
</dl>
</div>
<<<<<<< .working
<a name="fusion.functional.concepts.poly.expression_requirements"></a><h5>
<a name="id612034"></a>
<a href="poly.html#fusion.functional.concepts.poly.expression_requirements">Expression
=======
<a name="fusion.functional.concepts.poly.expression_requirements"></a><h6>
<a name="id820471"></a>
<a class="link" href="poly.html#fusion.functional.concepts.poly.expression_requirements">Expression
>>>>>>> .merge-right.r57125
requirements</a>
</h5>
<div class="informaltable"><table class="table">
@ -123,12 +147,21 @@
</p></td>
</tr></tbody>
</table></div>
<<<<<<< .working
<a name="fusion.functional.concepts.poly.models"></a><h5>
<a name="id612231"></a>
<a href="poly.html#fusion.functional.concepts.poly.models">Models</a>
</h5>
<div class="itemizedlist"><ul type="disc">
<li>
=======
<a name="fusion.functional.concepts.poly.models"></a><h6>
<a name="id820623"></a>
<a class="link" href="poly.html#fusion.functional.concepts.poly.models">Models</a>
</h6>
<div class="itemizedlist"><ul class="itemizedlist" type="disc">
<li class="listitem">
>>>>>>> .merge-right.r57125
function pointers
</li>
<li>
@ -138,10 +171,17 @@
all Fusion <a href="../adapters.html" title=" Adapters">functional adapters</a>
</li>
</ul></div>
<<<<<<< .working
<a name="fusion.functional.concepts.poly.examples"></a><h5>
<a name="id612283"></a>
<a href="poly.html#fusion.functional.concepts.poly.examples">Examples</a>
</h5>
=======
<a name="fusion.functional.concepts.poly.examples"></a><h6>
<a name="id820656"></a>
<a class="link" href="poly.html#fusion.functional.concepts.poly.examples">Examples</a>
</h6>
>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="special">&amp;</span> <span class="identifier">a_free_function</span>
<span class="special">&amp;</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_static_member_function</span>
<span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;()</span>

View File

@ -4,7 +4,11 @@
<title> Regular Callable
Object</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="../concepts.html" title="Concepts">
<link rel="previous" href="callable.html" title=" Callable Object">
@ -30,6 +34,7 @@
<a name="fusion.functional.concepts.reg_callable"></a><a href="reg_callable.html" title=" Regular Callable
Object"> Regular Callable
Object</a>
<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@ -37,14 +42,27 @@
<a name="id610148"></a>
<a href="reg_callable.html#fusion.functional.concepts.reg_callable.description">Description</a>
</h5>
=======
</h4></div></div></div>
<a name="fusion.functional.concepts.reg_callable.description"></a><h6>
<a name="id816930"></a>
<a class="link" href="reg_callable.html#fusion.functional.concepts.reg_callable.description">Description</a>
</h6>
>>>>>>> .merge-right.r57125
<p>
A non-member-pointer <a href="callable.html" title=" Callable Object">Callable
Object</a> type: A pointer to a function or a class type whose objects
can appear immediately to the left of a function call operator.
</p>
<<<<<<< .working
<a name="fusion.functional.concepts.reg_callable.refinement_of"></a><h5>
<a name="id610189"></a>
<a href="reg_callable.html#fusion.functional.concepts.reg_callable.refinement_of">Refinement
=======
<a name="fusion.functional.concepts.reg_callable.refinement_of"></a><h6>
<a name="id816952"></a>
<a class="link" href="reg_callable.html#fusion.functional.concepts.reg_callable.refinement_of">Refinement
>>>>>>> .merge-right.r57125
of</a>
</h5>
<div class="itemizedlist"><ul type="disc"><li><a href="callable.html" title=" Callable Object">Callable Object</a></li></ul></div>
@ -72,9 +90,15 @@
</p></dd>
</dl>
</div>
<<<<<<< .working
<a name="fusion.functional.concepts.reg_callable.expression_requirements"></a><h5>
<a name="id610374"></a>
<a href="reg_callable.html#fusion.functional.concepts.reg_callable.expression_requirements">Expression
=======
<a name="fusion.functional.concepts.reg_callable.expression_requirements"></a><h6>
<a name="id817092"></a>
<a class="link" href="reg_callable.html#fusion.functional.concepts.reg_callable.expression_requirements">Expression
>>>>>>> .merge-right.r57125
requirements</a>
</h5>
<div class="informaltable"><table class="table">
@ -107,22 +131,38 @@
</p></td>
</tr></tbody>
</table></div>
<<<<<<< .working
<a name="fusion.functional.concepts.reg_callable.models"></a><h5>
<a name="id610508"></a>
<a href="reg_callable.html#fusion.functional.concepts.reg_callable.models">Models</a>
</h5>
<div class="itemizedlist"><ul type="disc">
<li>
=======
<a name="fusion.functional.concepts.reg_callable.models"></a><h6>
<a name="id817200"></a>
<a class="link" href="reg_callable.html#fusion.functional.concepts.reg_callable.models">Models</a>
</h6>
<div class="itemizedlist"><ul class="itemizedlist" type="disc">
<li class="listitem">
>>>>>>> .merge-right.r57125
function pointer types
</li>
<li>
all kinds of function objects
</li>
</ul></div>
<<<<<<< .working
<a name="fusion.functional.concepts.reg_callable.examples"></a><h5>
<a name="id610545"></a>
<a href="reg_callable.html#fusion.functional.concepts.reg_callable.examples">Examples</a>
</h5>
=======
<a name="fusion.functional.concepts.reg_callable.examples"></a><h6>
<a name="id817224"></a>
<a class="link" href="reg_callable.html#fusion.functional.concepts.reg_callable.examples">Examples</a>
</h6>
>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="special">&amp;</span> <span class="identifier">a_free_function</span>
<span class="special">&amp;</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_static_member_function</span>
<span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;()</span>