merged phoenix to release branch

[SVN r71229]

7 files changed, 35 insertions, 3 deletions

diff --git a/.gitmodules b/.gitmodules
index c596a4a8d0..4bb813e892 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -386,3 +386,7 @@
 	path = libs/geometry
 	url = ../geometry.git
 	fetchRecurseSubmodules = on-demand
+[submodule "phoenix"]
+	path = libs/phoenix
+	url = ../phoenix.git
+	fetchRecurseSubmodules = on-demand
diff --git a/libs/libraries.htm b/libs/libraries.htm
index 442cbbfa23..c34e216980 100644
--- a/libs/libraries.htm
+++ b/libs/libraries.htm
@@ -213,6 +213,9 @@ how to download, build, and install the libraries.</p>
     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>
@@ -448,7 +451,9 @@ how to download, build, and install the libraries.</p>
     <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>
diff --git a/libs/maintainers.txt b/libs/maintainers.txt
index c631c84d30..1e3ec9e984 100644
--- a/libs/maintainers.txt
+++ b/libs/maintainers.txt
@@ -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>
diff --git a/libs/phoenix b/libs/phoenix
new file mode 160000
+Subproject a3a9e27578a518342a118f9f4fc98ff3314bbd6
diff --git a/libs/spirit b/libs/spirit
-Subproject af164e831c7fdb7161edea83c90a3df4bab7c87
+Subproject d393ef2f1c254220af147a0337485e850c74485
diff --git a/status/Jamfile.v2 b/status/Jamfile.v2
index 535260b31e..9844f264c0 100644
--- a/status/Jamfile.v2
+++ b/status/Jamfile.v2
@@ -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
diff --git a/status/explicit-failures-markup.xml b/status/explicit-failures-markup.xml
index ffdf765379..c188143882 100644
--- a/status/explicit-failures-markup.xml
+++ b/status/explicit-failures-markup.xml
@@ -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>
@@ -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>