merge from trunk

[SVN r61189]
This commit is contained in:
Christopher Schmidt
2010-04-11 00:31:21 +00:00
parent 994b37e4d5
commit dc8225a7aa
276 changed files with 9730 additions and 8922 deletions

View File

@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Introduction</title>
<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
<link rel="prev" href="preface.html" title="Preface">
@ -117,7 +117,7 @@
sequences are fully compatible with Fusion. You can work with Fusion sequences
on <a href="http://www.boost.org/libs/mpl/index.html" target="_top">MPL</a> if you
wish to work solely on types
<sup>[<a name="id557825" href="#ftn.id557825" class="footnote">1</a>]</sup>
<sup>[<a name="id656660" href="#ftn.id656660" class="footnote">1</a>]</sup>
. In <a href="http://www.boost.org/libs/mpl/index.html" target="_top">MPL</a>, Fusion
sequences follow <a href="http://www.boost.org/libs/mpl/index.html" target="_top">MPL</a>'s
sequence-type preserving semantics (i.e. algorithms preserve the original sequence
@ -132,7 +132,7 @@
</p>
<div class="footnotes">
<br><hr width="100" align="left">
<div class="footnote"><p><sup>[<a name="ftn.id557825" href="#id557825" class="para">1</a>] </sup>
<div class="footnote"><p><sup>[<a name="ftn.id656660" href="#id656660" class="para">1</a>] </sup>
Choose <a href="http://www.boost.org/libs/mpl/index.html" target="_top">MPL</a>
over fusion when doing pure type calculations. Once the static type calculation
is finished, you can instantiate a fusion sequence (see <a class="link" href="container/conversion/functions.html" title="Functions">Conversion</a>)