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.
Write functions that accept arguments by name, by David Abrahams
and Daniel Wallin.
+ Phoenix - Define small unnamed
+ function objects at the actual call site, and more, from Joel de Guzman, Dan
+ Marsden and Thomas Heller
pointer container
- Containers for storing heap-allocated polymorphic objects to ease
OO-programming, from Thorsten Ottosen.
@@ -448,7 +451,9 @@ how to download, build, and install the libraries.
lambda - Define small unnamed
function objects at the actual call site, and more, from Jaakko Järvi and
Gary Powell.
-
+ Phoenix - Define small unnamed
+ function objects at the actual call site, and more, from Joel de Guzman, Dan
+ Marsden and Thomas Heller
ref - A utility library for
passing references to generic functions, from Jaako Järvi,
Peter Dimov, Doug Gregor, and Dave Abrahams.
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
optional Fernando Cacciola
operators Daniel Frey
parameter David Abrahams , Daniel Wallin
+phoenix Joel de Guzman , Thomas Heller
polygon Lucanus Simonson
pool Stephen Cleary
preprocessor Paul Mensonides
diff --git a/libs/phoenix b/libs/phoenix
new file mode 160000
index 0000000000..a3a9e27578
--- /dev/null
+++ b/libs/phoenix
@@ -0,0 +1 @@
+Subproject commit a3a9e27578a518342a118f9f4fc98ff3314bbd61
diff --git a/libs/spirit b/libs/spirit
index af164e831c..d393ef2f1c 160000
--- a/libs/spirit
+++ b/libs/spirit
@@ -1 +1 @@
-Subproject commit af164e831c7fdb7161edea83c90a3df4bab7c872
+Subproject commit d393ef2f1c254220af147a0337485e850c744858
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.
+
+
+
+
+
+
+
+
+
+
+
+ These compilers don't work with phoenix.
+ This is due to the fact that phoenix uses proto
+
+
+
+
@@ -2872,8 +2889,12 @@ for more information.
-
-
+
+
+
+
+
+