Skip to content

Commit

Permalink
merged phoenix to release branch
Browse files Browse the repository at this point in the history
[SVN r71229]
  • Loading branch information
sithhell committed Apr 13, 2011
1 parent 685b190 commit 14981da
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -386,3 +386,7 @@
path = libs/geometry
url = ../geometry.git
fetchRecurseSubmodules = on-demand
[submodule "phoenix"]
path = libs/phoenix
url = ../phoenix.git
fetchRecurseSubmodules = on-demand
7 changes: 6 additions & 1 deletion libs/libraries.htm
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,9 @@ <h2>Libraries Listed <a name="Alphabetically">Alphabetically</a></h2>
Write functions that accept arguments by name, by David Abrahams
and Daniel Wallin.</li>

<li><a href="phoenix/index.html">Phoenix</a> - Define small unnamed
function objects at the actual call site, and more, from Joel de Guzman, Dan
Marsden and Thomas Heller</li>
<li><a href="ptr_container/index.html">pointer container</a>
- Containers for storing heap-allocated polymorphic objects to ease
OO-programming, from Thorsten Ottosen. </li>
Expand Down Expand Up @@ -448,7 +451,9 @@ <h3><a name="Function-objects">Function objects</a> and higher-order programming
<li><a href="lambda/index.html">lambda</a> - Define small unnamed
function objects at the actual call site, and more, from Jaakko J&auml;rvi and
Gary Powell.</li>

<li><a href="phoenix/index.html">Phoenix</a> - Define small unnamed
function objects at the actual call site, and more, from Joel de Guzman, Dan
Marsden and Thomas Heller</li>
<li><a href="bind/ref.html">ref</a> - A utility library for
passing references to generic functions, from Jaako J&auml;rvi,
Peter Dimov, Doug Gregor, and Dave Abrahams.</li>
Expand Down
1 change: 1 addition & 0 deletions libs/maintainers.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ numeric/ublas Michael Stevens <michael -at- michael-stevens.de>
optional Fernando Cacciola <fernando_cacciola -at- ciudad.com.ar>
operators Daniel Frey <d.frey -at- gmx.de>
parameter David Abrahams <dave -at- boost-consulting.com>, Daniel Wallin <daniel -at- boostpro.com>
phoenix Joel de Guzman <joel -at- boost-consulting.com>, Thomas Heller <thom.heller -at- gmail.com>
polygon Lucanus Simonson <lucanus.j.simonson -at- intel.com>
pool Stephen Cleary <scleary -at- jerviswebb.com>
preprocessor Paul Mensonides <pmenso57 -at- comcast.net>
Expand Down
1 change: 1 addition & 0 deletions libs/phoenix
Submodule phoenix added at a3a9e2
2 changes: 1 addition & 1 deletion libs/spirit
1 change: 1 addition & 0 deletions status/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ run-tests libs :
multi_index/test # test-suite multi_index
optional/test # test-suite optional
parameter/test # test-suite parameter
phoenix/test # test-suite phoenix
polygon/test # test-suite polygon
pool/test # test-suite pool
preprocessor/test # test-suite preprocessor
Expand Down
25 changes: 23 additions & 2 deletions status/explicit-failures-markup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2594,6 +2594,23 @@ for more information.
<note author="Fernando Cacciola" refid="optional-compiler-bug"/>
</mark-expected-failures>
</library>

<!-- phoenix -->
<library name="phoenix">
<mark-unusable>
<toolset name="sun-5.7"/>
<toolset name="sun-5.8"/>
<toolset name="sun-5.9"/>
<toolset name="sun-5.10"/>
<toolset name="borland-*"/>
<toolset name="vacpp*"/>
<note author="Thomas Heller" id="phoenix-incompatible compilers">
These compilers don't work with phoenix.
This is due to the fact that phoenix uses proto
</note>
</mark-unusable>
</library>


<library name="pool">
<mark-unusable>
Expand Down Expand Up @@ -2872,8 +2889,12 @@ for more information.
<!-- spirit (v2) -->
<library name="spirit">
<mark-unusable>
<toolset name="borland-cb2009"/>
<toolset name="borland-cb2010"/>
<toolset name="sun-5.7"/>
<toolset name="sun-5.8"/>
<toolset name="sun-5.9"/>
<toolset name="sun-5.10"/>
<toolset name="vacpp*"/>
<toolset name="borland-*"/>
</mark-unusable>
</library>

Expand Down

0 comments on commit 14981da

Please sign in to comment.