Release 1.49.0 beta 1

[SVN r76721]
Merge config changes from Trunk.
2026-03-07 14:24:10 +01:00 · 2012-01-27 18:03:17 +00:00 · 2012-01-07 17:29:04 +00:00 · 2011-12-23 17:17:31 +00:00 · 2011-11-26 18:53:17 +00:00 · 2011-10-10 11:50:55 +00:00
121 changed files with 3558 additions and 2407 deletions
--- a/2854
+++ b/2854
--- a/doc/html/boost_config/acknowledgements.html
+++ b/doc/html/boost_config/acknowledgements.html
@@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Acknowledgements</title>
 <link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.74.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Config">
 <link rel="up" href="../index.html" title="Boost.Config">
 <link rel="prev" href="rationale.html" title="Rationale">
@@ -21,7 +21,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="rationale.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="boost_config.acknowledgements"></a><a class="link" href="acknowledgements.html" title="Acknowledgements">Acknowledgements</a>
 </h2></div></div></div>
@@ -47,7 +47,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001 -2007 Beman Dawes, Vesa Karvonen, John Maddock<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Beman Dawes, Vesa Karvonen, John
+      Maddock<p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
--- a/doc/html/boost_config/boost_macro_reference.html
+++ b/doc/html/boost_config/boost_macro_reference.html
@@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Boost Macro Reference</title>
 <link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.74.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Config">
 <link rel="up" href="../index.html" title="Boost.Config">
 <link rel="prev" href="../index.html" title="Boost.Config">
@@ -22,19 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../index.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="guidelines_for_boost_authors.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="boost_config.boost_macro_reference"></a><a class="link" href="boost_macro_reference.html" title="Boost Macro Reference">Boost Macro Reference</a>
 </h2></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_defects">Macros
-      that describe defects</a></span></dt>
+<dt><span class="section"><a href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_c__03_defects">Macros
+      that describe C++03 defects</a></span></dt>
 <dt><span class="section"><a href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_optional_features">Macros
      that describe optional features</a></span></dt>
-<dt><span class="section"><a href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_possible_c__0x_features">Macros
-      that describe possible C++0x features</a></span></dt>
-<dt><span class="section"><a href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_c__0x_features_not_supported">Macros
-      that describe C++0x features not supported</a></span></dt>
+<dt><span class="section"><a href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_possible_c___future_features">Macros
+      that describe possible C++ future features</a></span></dt>
+<dt><span class="section"><a href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_c__11_features_not_supported">Macros
+      that describe C++11 features not supported</a></span></dt>
+<dt><span class="section"><a href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_allow_use_of_c__11_features_with_c__03_compilers">Macros
+      that allow use of C++11 features with C++03 compilers</a></span></dt>
 <dt><span class="section"><a href="boost_macro_reference.html#boost_config.boost_macro_reference.boost_helper_macros">Boost
      Helper Macros</a></span></dt>
 <dt><span class="section"><a href="boost_macro_reference.html#boost_config.boost_macro_reference.boost_informational_macros">Boost
@@ -42,17 +44,15 @@
 <dt><span class="section"><a href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_for_libraries_with_separate_source_code">Macros
      for libraries with separate source code</a></span></dt>
 </dl></div>
-<a name="config_defects"></a><p>
-    </p>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_config.boost_macro_reference.macros_that_describe_defects"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_defects" title="Macros that describe defects">Macros
-      that describe defects</a>
+<a name="boost_config.boost_macro_reference.macros_that_describe_c__03_defects"></a><a name="config_defects"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_c__03_defects" title="Macros that describe C++03 defects">Macros
+      that describe C++03 defects</a>
 </h3></div></div></div>
 <p>
-        The following macros all describe features that are required by the C++ standard,
-        if one of the following macros is defined, then it represents a defect in
-        the compiler's conformance with the standard.
+        The following macros all describe features that are required by the C++03
+        standard, if one of the following macros is defined, then it represents a
+        defect in the compiler's conformance with the 2003 standard.
      </p>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -282,6 +282,26 @@
              </td>
 </tr>
 <tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">BOOST_NO_FENV_H</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  Platform, Standard library
+                </p>
+              </td>
+<td>
+                <p>
+                  The C standard library doesn't provide <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">fenv</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span></code>.
+                  <a href="../../../../../boost/detail/fenv.hpp" target="_top"><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">detail</span><span class="special">/</span><span class="identifier">fenv</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code></a>
+                  should be included instead of <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">fenv</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span></code>
+                  for maximum portability on platforms which do provide <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">fenv</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span></code>.
+                </p>
+              </td>
+</tr>
+<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_NO_DEPENDENT_NESTED_DERIVATIONS</span></code>
@@ -404,16 +424,16 @@
                  The compiler does not perform function template ordering or its
                  function template ordering is incorrect. 
 </p>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="comment">// #1
-</span><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">T</span><span class="special">&gt;</span> <span class="keyword">void</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">T</span><span class="special">);</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="comment">// #1</span>
+<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">T</span><span class="special">&gt;</span> <span class="keyword">void</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">T</span><span class="special">);</span>

-<span class="comment">// #2
-</span><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">T</span><span class="special">,</span><span class="keyword">class</span> <span class="identifier">U</span><span class="special">&gt;</span> <span class="keyword">void</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">T</span><span class="special">(*)(</span><span class="identifier">U</span><span class="special">));</span>
+<span class="comment">// #2</span>
+<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">T</span><span class="special">,</span><span class="keyword">class</span> <span class="identifier">U</span><span class="special">&gt;</span> <span class="keyword">void</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">T</span><span class="special">(*)(</span><span class="identifier">U</span><span class="special">));</span>

 <span class="keyword">void</span> <span class="identifier">bar</span><span class="special">(</span><span class="keyword">int</span><span class="special">);</span>

-<span class="identifier">f</span><span class="special">(&amp;</span><span class="identifier">bar</span><span class="special">);</span> <span class="comment">// should choose #2.
-</span></pre>
+<span class="identifier">f</span><span class="special">(&amp;</span><span class="identifier">bar</span><span class="special">);</span> <span class="comment">// should choose #2.</span>
+</pre>
 <p>
                </p>
              </td>
@@ -1306,11 +1326,9 @@
 </tbody>
 </table></div>
 </div>
-<a name="config_features"></a><p>
-    </p>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_config.boost_macro_reference.macros_that_describe_optional_features"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_optional_features" title="Macros that describe optional features">Macros
+<a name="boost_config.boost_macro_reference.macros_that_describe_optional_features"></a><a name="config_features"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_optional_features" title="Macros that describe optional features">Macros
      that describe optional features</a>
 </h3></div></div></div>
 <p>
@@ -1423,7 +1441,24 @@
              </td>
 <td>
                <p>
-                  The platform has the Win32 API <code class="computeroutput"><span class="identifier">GetSystemTimeAsFileTime</span></code>.
+                  The platform has the Win32 API type FTIME.
+                </p>
+              </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">BOOST_HAS_GETSYSTEMTIMEASFILETIME</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  Platform
+                </p>
+              </td>
+<td>
+                <p>
+                  The platform has the Win32 API GetSystemTimeAsFileTime.
                </p>
              </td>
 </tr>
@@ -1695,26 +1730,6 @@
              </td>
 </tr>
 <tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">BOOST_HAS_FENV_H</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  Platform, Standard library
-                </p>
-              </td>
-<td>
-                <p>
-                  The platform has a <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">fenv</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span></code>.
-                  <a href="../../../../../boost/detail/fenv.hpp" target="_top"><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">detail</span><span class="special">/</span><span class="identifier">fenv</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code></a>
-                  should be included instead of <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">fenv</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span></code>
-                  for maximum portability.
-                </p>
-              </td>
-</tr>
-<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_HAS_STDINT_H</span></code>
@@ -2220,15 +2235,14 @@
 </tbody>
 </table></div>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_config.boost_macro_reference.macros_that_describe_possible_c__0x_features"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_possible_c__0x_features" title="Macros that describe possible C++0x features">Macros
-      that describe possible C++0x features</a>
+<a name="boost_config.boost_macro_reference.macros_that_describe_possible_c___future_features"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_possible_c___future_features" title="Macros that describe possible C++ future features">Macros
+      that describe possible C++ future features</a>
 </h3></div></div></div>
 <p>
-        The following macros describe features that are likely to be included in
-        the upcoming ISO C++ standard, C++0x, but have not yet been approved for
-        inclusion in the language.
+        The following macros describe features that may be included in some future
+        ISO C++ standard, but have not yet been approved for inclusion in the language.
      </p>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -2261,14 +2275,14 @@
 </tr></tbody>
 </table></div>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_config.boost_macro_reference.macros_that_describe_c__0x_features_not_supported"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_c__0x_features_not_supported" title="Macros that describe C++0x features not supported">Macros
-      that describe C++0x features not supported</a>
+<a name="boost_config.boost_macro_reference.macros_that_describe_c__11_features_not_supported"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_c__11_features_not_supported" title="Macros that describe C++11 features not supported">Macros
+      that describe C++11 features not supported</a>
 </h3></div></div></div>
 <p>
-        The following macros describe features in the upcoming ISO C++ standard,
-        C++0x, that are not yet supported by a particular compiler or library.
+        The following macros describe features in the 2011 ISO C++ standard, formerly
+        known as C++0x, that are not yet supported by a particular compiler or library.
      </p>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -2325,18 +2339,6 @@
              </td>
 </tr>
 <tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">BOOST_NO_0X_HDR_CONCEPTS</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  The standard library does not provide header &lt;concepts&gt;.
-                </p>
-              </td>
-</tr>
-<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_NO_0X_HDR_CONDITION_VARIABLE</span></code>
@@ -2349,18 +2351,6 @@
              </td>
 </tr>
 <tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">BOOST_NO_0X_HDR_CONTAINER_CONCEPTS</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  The standard library does not provide header &lt;container_concepts&gt;.
-                </p>
-              </td>
-</tr>
-<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_NO_0X_HDR_FORWARD_LIST</span></code>
@@ -2397,30 +2387,6 @@
              </td>
 </tr>
 <tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">BOOST_NO_0X_HDR_ITERATOR_CONCEPTS</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  The standard library does not provide header &lt;iterator_concepts&gt;.
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">BOOST_NO_0X_HDR_MEMORY_CONCEPTS</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  The standard library does not provide header &lt;memory_concepts&gt;.
-                </p>
-              </td>
-</tr>
-<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_NO_0X_HDR_MUTEX</span></code>
@@ -2609,18 +2575,6 @@
              </td>
 </tr>
 <tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">BOOST_NO_CONCEPTS</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  The compiler does not support Concepts.
-                </p>
-              </td>
-</tr>
-<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_NO_TEMPLATE_ALIASES</span></code>
@@ -2657,6 +2611,20 @@
              </td>
 </tr>
 <tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">BOOST_NO_DECLTYPE_N3276</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  The compiler does not support the extension to <code class="computeroutput"><span class="identifier">decltype</span></code>
+                  described in <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3276.pdf" target="_top">N3276</a>,
+                  accepted in Madrid, March 2011.
+                </p>
+              </td>
+</tr>
+<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_NO_DEFAULTED_FUNCTIONS</span></code>
@@ -2759,6 +2727,18 @@
              </td>
 </tr>
 <tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">BOOST_NO_NOEXCEPT</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  The compiler does not support <code class="computeroutput"><span class="identifier">noexcept</span></code>.
+                </p>
+              </td>
+</tr>
+<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_NO_NULLPTR</span></code>
@@ -2766,7 +2746,7 @@
              </td>
 <td>
                <p>
-                  The compiler does not support 'nullptr'.
+                  The compiler does not support <code class="computeroutput"><span class="identifier">nullptr</span></code>.
                </p>
              </td>
 </tr>
@@ -2857,6 +2837,19 @@
              </td>
 </tr>
 <tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  The compiler does not support the <a href="http://en.wikipedia.org/wiki/C%2B%2B0x#Uniform_initialization" target="_top">C++11
+                  Unified Initialization Syntax</a>.
+                </p>
+              </td>
+</tr>
+<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_NO_VARIADIC_TEMPLATES</span></code>
@@ -2883,11 +2876,162 @@
 </tbody>
 </table></div>
 </div>
-<a name="config_helpers"></a><p>
-    </p>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_config.boost_macro_reference.boost_helper_macros"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.boost_helper_macros" title="Boost Helper Macros">Boost
+<a name="boost_config.boost_macro_reference.macros_that_allow_use_of_c__11_features_with_c__03_compilers"></a><a name="config_11_for_03"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_allow_use_of_c__11_features_with_c__03_compilers" title="Macros that allow use of C++11 features with C++03 compilers">Macros
+      that allow use of C++11 features with C++03 compilers</a>
+</h3></div></div></div>
+<p>
+        The following macros allow use of C++11 features even with compilers that
+        do not yet provide compliant C++11 support.
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Macro
+                </p>
+              </th>
+<th>
+                <p>
+                  Section
+                </p>
+              </th>
+<th>
+                <p>
+                  Description
+                </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">BOOST_CONSTEXPR</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  Some compilers don't support the use of <code class="computeroutput"><span class="identifier">constexpr</span></code>.
+                  This macro expands to nothing on those compilers, and <code class="computeroutput"><span class="identifier">constexpr</span></code> elsewhere. For example,
+                  when defining a constexpr function or constructor replace: 
+</p>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="identifier">constexpr</span> <span class="identifier">tuple</span><span class="special">();</span>
+</pre>
+<p>
+                  with: 
+</p>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="identifier">BOOST_CONSTEXPR</span> <span class="identifier">tuple</span><span class="special">();</span>
+</pre>
+<p>
+                </p>
+              </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">BOOST_CONSTEXPR_OR_CONST</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  Some compilers don't support the use of <code class="computeroutput"><span class="identifier">constexpr</span></code>.
+                  This macro expands to <code class="computeroutput"><span class="keyword">const</span></code>
+                  on those compilers, and <code class="computeroutput"><span class="identifier">constexpr</span></code>
+                  elsewhere. For example, when defining const expr variables replace:
+                  
+</p>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="keyword">static</span> <span class="identifier">constexpr</span> <span class="identifier">UIntType</span> <span class="identifier">xor_mask</span> <span class="special">=</span> <span class="identifier">a</span><span class="special">;</span>
+</pre>
+<p>
+                  with: 
+</p>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="keyword">static</span> <span class="identifier">BOOST_CONSTEXPR_OR_CONST</span> <span class="identifier">UIntType</span> <span class="identifier">xor_mask</span> <span class="special">=</span> <span class="identifier">a</span><span class="special">;</span>
+</pre>
+<p>
+                </p>
+              </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">BOOST_STATIC_CONSTEXPR</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  This is a shortcut for <code class="computeroutput"><span class="keyword">static</span>
+                  <span class="identifier">BOOST_CONSTEXPR_OR_CONST</span></code>For
+                  example, when defining const expr variables replace: 
+</p>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="keyword">static</span> <span class="identifier">constexpr</span> <span class="identifier">UIntType</span> <span class="identifier">xor_mask</span> <span class="special">=</span> <span class="identifier">a</span><span class="special">;</span>
+</pre>
+<p>
+                  with: 
+</p>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="identifier">BOOST_STATIC_CONSTEXPR</span> <span class="identifier">UIntType</span> <span class="identifier">xor_mask</span> <span class="special">=</span> <span class="identifier">a</span><span class="special">;</span>
+</pre>
+<p>
+                </p>
+              </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  
+</p>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="identifier">BOOST_NOEXCEPT</span>
+<span class="identifier">BOOST_NOEXCEPT_IF</span><span class="special">(</span><span class="identifier">Predicate</span><span class="special">)</span>
+<span class="identifier">BOOST_NOEXCEPT_EXPR</span><span class="special">(</span><span class="identifier">Expression</span><span class="special">)</span>
+</pre>
+<p>
+                </p>
+              </td>
+<td>
+                <p>
+                  If <code class="computeroutput"><span class="identifier">BOOST_NO_NOEXCEPT</span></code>
+                  is defined (i.e. C++03 compliant compilers) these macros are defined
+                  as:
+                </p>
+                <div class="blockquote"><blockquote class="blockquote">
+<p>
+                    
+</p>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_NOEXCEPT</span>
+<span class="preprocessor">#define</span> <span class="identifier">BOOST_NOEXCEPT_IF</span><span class="special">(</span><span class="identifier">Predicate</span><span class="special">)</span>
+<span class="preprocessor">#define</span> <span class="identifier">BOOST_NOEXCEPT_EXPR</span><span class="special">(</span><span class="identifier">Expression</span><span class="special">)</span> <span class="keyword">false</span>
+</pre>
+<p>
+                  </p>
+</blockquote></div>
+                <p>
+                  If <code class="computeroutput"><span class="identifier">BOOST_NO_NOEXCEPT</span></code>
+                  is not defined (i.e. C++11 compliant compilers) they are defined
+                  as:
+                </p>
+                <div class="blockquote"><blockquote class="blockquote">
+<p>
+                    
+</p>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_NOEXCEPT</span> <span class="identifier">noexcept</span>
+<span class="preprocessor">#define</span> <span class="identifier">BOOST_NOEXCEPT_IF</span><span class="special">(</span><span class="identifier">Predicate</span><span class="special">)</span> <span class="identifier">noexcept</span><span class="special">((</span><span class="identifier">Predicate</span><span class="special">))</span>
+<span class="preprocessor">#define</span> <span class="identifier">BOOST_NOEXCEPT_EXPR</span><span class="special">(</span><span class="identifier">Expression</span><span class="special">)</span> <span class="identifier">noexcept</span><span class="special">((</span><span class="identifier">Expression</span><span class="special">))</span>
+</pre>
+<p>
+                  </p>
+</blockquote></div>
+              </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="boost_config.boost_macro_reference.boost_helper_macros"></a><a name="config_helpers"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.boost_helper_macros" title="Boost Helper Macros">Boost
      Helper Macros</a>
 </h3></div></div></div>
 <p>
@@ -2930,10 +3074,10 @@
                  usage is then: 
 </p>
 <pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="preprocessor">#if</span> <span class="identifier">BOOST_WORKAROUND</span><span class="special">(</span><span class="identifier">MACRONAME</span><span class="special">,</span> <span class="identifier">CONDITION</span><span class="special">)</span>
-   <span class="comment">// workaround code goes here...
-</span><span class="preprocessor">#else</span>
-   <span class="comment">// Standard conforming code goes here...
-</span><span class="preprocessor">#endif</span>
+   <span class="comment">// workaround code goes here...</span>
+<span class="preprocessor">#else</span>
+   <span class="comment">// Standard conforming code goes here...</span>
+<span class="preprocessor">#endif</span>
 </pre>
 <p>
                  where <code class="computeroutput"><span class="identifier">MACRONAME</span></code>
@@ -2960,6 +3104,30 @@
              </td>
 </tr>
 <tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">BOOST_PREVENT_MACRO_SUBSTITUTION</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  Sometimes you have a function name with the same name as a C macro,
+                  for example "min" and "max" member functions,
+                  in which case one can prevent the function being expanded as a
+                  macro using: 
+</p>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="identifier">someclass</span><span class="special">.</span><span class="identifier">min</span> <span class="identifier">BOOST_PREVENT_MACRO_SUBSTITUTION</span><span class="special">(</span><span class="identifier">arg1</span><span class="special">,</span> <span class="identifier">arg2</span><span class="special">);</span>
+</pre>
+<p>
+                  The following also works in most, but not all, contexts: 
+</p>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">(</span><span class="identifier">someclass</span><span class="special">.</span><span class="identifier">max</span><span class="special">)(</span><span class="identifier">arg1</span><span class="special">,</span> <span class="identifier">arg2</span><span class="special">);</span>
+</pre>
+<p>
+                </p>
+              </td>
+</tr>
+<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_DEDUCED_TYPENAME</span></code>
@@ -3223,82 +3391,43 @@
 <tr>
 <td>
                <p>
-                  <code class="computeroutput"><span class="identifier">BOOST_CONSTEXPR</span></code>
+                  <code class="computeroutput"><span class="identifier">BOOST_FORCEINLINE</span></code>
                </p>
              </td>
 <td>
                <p>
-                  Some compilers don't support the use of <code class="computeroutput"><span class="identifier">constexpr</span></code>.
-                  This macro expands to nothing on those compilers, and <code class="computeroutput"><span class="identifier">constexpr</span></code> elsewhere. For example,
-                  when defining a constexpr function or constructor replace: 
+                  This macro can be used in place of the <code class="computeroutput"><span class="keyword">inline</span></code>
+                  keyword to instruct the compiler that a function should always
+                  be inlined. Overuse of this macro can lead to significant bloat,
+                  while good use can increase performance in certain cases, such
+                  as computation-intensive code built through generative programming
+                  techniques.
+                </p>
+                <p>
+                  Usage example: 
 </p>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="identifier">constexpr</span> <span class="identifier">tuple</span><span class="special">();</span>
-</pre>
-<p>
-                  with: 
-</p>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="identifier">BOOST_CONSTEXPR</span> <span class="identifier">tuple</span><span class="special">();</span>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">T</span><span class="special">&gt;</span>
+<span class="identifier">BOOST_FORCEINLINE</span> <span class="identifier">T</span><span class="special">&amp;</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">T</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">)</span>
+<span class="special">{</span>
+    <span class="keyword">return</span> <span class="identifier">t</span><span class="special">;</span>
+<span class="special">}</span>
 </pre>
 <p>
                </p>
-              </td>
-</tr>
-<tr>
-<td>
                <p>
-                  <code class="computeroutput"><span class="identifier">BOOST_CONSTEXPR_OR_CONST</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  Some compilers don't support the use of <code class="computeroutput"><span class="identifier">constexpr</span></code>.
-                  This macro expands to <code class="computeroutput"><span class="keyword">const</span></code>
-                  on those compilers, and <code class="computeroutput"><span class="identifier">constexpr</span></code>
-                  elsewhere. For example, when defining const expr variables replace:
-                  
-</p>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="keyword">static</span> <span class="identifier">constexpr</span> <span class="identifier">UIntType</span> <span class="identifier">xor_mask</span> <span class="special">=</span> <span class="identifier">a</span><span class="special">;</span>
-</pre>
-<p>
-                  with: 
-</p>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="keyword">static</span> <span class="identifier">BOOST_CONSTEXPR_OR_CONST</span> <span class="identifier">UIntType</span> <span class="identifier">xor_mask</span> <span class="special">=</span> <span class="identifier">a</span><span class="special">;</span>
-</pre>
-<p>
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">BOOST_STATIC_CONSTEXPR</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  This is a shortcut for <code class="computeroutput"><span class="keyword">static</span>
-                  <span class="identifier">BOOST_CONSTEXPR_OR_CONST</span></code>For
-                  example, when defining const expr variables replace: 
-</p>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="keyword">static</span> <span class="identifier">constexpr</span> <span class="identifier">UIntType</span> <span class="identifier">xor_mask</span> <span class="special">=</span> <span class="identifier">a</span><span class="special">;</span>
-</pre>
-<p>
-                  with: 
-</p>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="identifier">BOOST_STATIC_CONSTEXPR</span> <span class="identifier">UIntType</span> <span class="identifier">xor_mask</span> <span class="special">=</span> <span class="identifier">a</span><span class="special">;</span>
-</pre>
-<p>
+                  Note that use of this macro can lead to cryptic error messages
+                  with some compilers. Consider defining it to <code class="computeroutput"><span class="keyword">inline</span></code>
+                  before including the Boost.Config header in order to be able to
+                  debug errors more easily.
                </p>
              </td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<a name="config_info_macros"></a><p>
-    </p>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_config.boost_macro_reference.boost_informational_macros"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.boost_informational_macros" title="Boost Informational Macros">Boost
+<a name="boost_config.boost_macro_reference.boost_informational_macros"></a><a name="config_info_macros"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.boost_informational_macros" title="Boost Informational Macros">Boost
      Informational Macros</a>
 </h3></div></div></div>
 <p>
@@ -3476,7 +3605,7 @@
              </td>
 <td>
                <p>
-                  Defined if the Windows platfrom API is available.
+                  Defined if the Windows platform API is available.
                </p>
              </td>
 </tr>
@@ -3574,7 +3703,7 @@
 </tbody>
 </table></div>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_config.boost_macro_reference.macros_for_libraries_with_separate_source_code"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_for_libraries_with_separate_source_code" title="Macros for libraries with separate source code">Macros
      for libraries with separate source code</a>
@@ -3591,14 +3720,14 @@
        The following macros and helper headers are of use to authors whose libraries
        include separate source code, and are intended to address several issues:
      </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
            Controlling shared library symbol visibility
          </li>
-<li>
+<li class="listitem">
            Fixing the ABI of the compiled library
          </li>
-<li>
+<li class="listitem">
            Selecting which compiled library to link against based upon the compilers
            settings
          </li>
@@ -3607,7 +3736,7 @@
        See <a href="http://svn.boost.org/trac/boost/wiki/Guidelines/Separate" target="_top">Guidelines
        for Authors of Boost Libraries Containing Separate Source</a>
      </p>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="boost_config.boost_macro_reference.macros_for_libraries_with_separate_source_code.macros_controlling_shared_library_symbol_visibility"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_for_libraries_with_separate_source_code.macros_controlling_shared_library_symbol_visibility" title="Macros controlling shared library symbol visibility">Macros
        controlling shared library symbol visibility</a>
@@ -3762,7 +3891,7 @@
 <span class="special">...</span>
 </pre>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="boost_config.boost_macro_reference.macros_for_libraries_with_separate_source_code.abi_fixing"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_for_libraries_with_separate_source_code.abi_fixing" title="ABI Fixing">ABI
        Fixing</a>
@@ -3790,28 +3919,28 @@
 <pre class="programlisting"><span class="preprocessor">#ifndef</span> <span class="identifier">MY_INCLUDE_GUARD</span>
 <span class="preprocessor">#define</span> <span class="identifier">MY_INCLUDE_GUARD</span>

-<span class="comment">// all includes go here:
-</span><code class="literal"><span class="bold"><strong>#include &lt;boost/config.hpp&gt;</strong></span></code>
+<span class="comment">// all includes go here:</span>
+<code class="literal"><span class="bold"><strong>#include &lt;boost/config.hpp&gt;</strong></span></code>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">whatever</span><span class="special">&gt;</span>

-<code class="literal"><span class="bold"><strong>#include &lt;boost/config/abi_prefix.hpp&gt;</strong></span></code> <span class="comment">// must be the last #include
-</span>
+<code class="literal"><span class="bold"><strong>#include &lt;boost/config/abi_prefix.hpp&gt;</strong></span></code> <span class="comment">// must be the last #include</span>
+
 <span class="keyword">namespace</span> <span class="identifier">boost</span> <span class="special">{</span>

-<span class="comment">// your code goes here
-</span>
+<span class="comment">// your code goes here</span>
+
 <span class="special">}</span>

-<code class="literal"><span class="bold"><strong>#include &lt;boost/config/abi_suffix.hpp&gt;</strong></span></code> <span class="comment">// pops abi_prefix.hpp pragmas
-</span>
-<span class="preprocessor">#endif</span> <span class="comment">// include guard
-</span></pre>
+<code class="literal"><span class="bold"><strong>#include &lt;boost/config/abi_suffix.hpp&gt;</strong></span></code> <span class="comment">// pops abi_prefix.hpp pragmas</span>
+
+<span class="preprocessor">#endif</span> <span class="comment">// include guard</span>
+</pre>
 <p>
          <span class="bold"><strong>my_library.cpp</strong></span>
        </p>
 <pre class="programlisting"><span class="special">...</span>
-<span class="comment">// nothing special need be done in the implementation file
-</span><span class="special">...</span>
+<span class="comment">// nothing special need be done in the implementation file</span>
+<span class="special">...</span>
 </pre>
 <p>
          The user can disable this mechanism by defining <code class="computeroutput"><span class="identifier">BOOST_DISABLE_ABI_HEADERS</span></code>,
@@ -3820,7 +3949,7 @@
          to point to their own prefix/suffix headers if they so wish.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="boost_config.boost_macro_reference.macros_for_libraries_with_separate_source_code.automatic_library_selection"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_for_libraries_with_separate_source_code.automatic_library_selection" title="Automatic library selection">Automatic
        library selection</a>
@@ -3875,12 +4004,12 @@
          <span class="bold"><strong>my_library.hpp</strong></span>
        </p>
 <pre class="programlisting"><span class="special">...</span>
-<span class="comment">//
-</span><span class="comment">// Don't include auto-linking code if the user has disabled it by
-</span><span class="comment">// defining BOOST_ALL_NO_LIB, or BOOST_MY_LIBRARY_NO_LIB, or if this 
-</span><span class="comment">// is one of our own source files (signified by BOOST_MY_LIBRARY_SOURCE):
-</span><span class="comment">//
-</span><span class="preprocessor">#if</span> <span class="special">!</span><span class="identifier">defined</span><span class="special">(</span><span class="identifier">BOOST_ALL_NO_LIB</span><span class="special">)</span> <span class="special">&amp;&amp;</span> <span class="special">!</span><span class="identifier">defined</span><span class="special">(</span><span class="identifier">BOOST_MY_LIBRARY_NO_LIB</span><span class="special">)</span> <span class="special">&amp;&amp;</span> <span class="special">!</span><span class="identifier">defined</span><span class="special">(</span><span class="identifier">BOOST_MY_LIBRARY_SOURCE</span><span class="special">)</span>
+<span class="comment">//</span>
+<span class="comment">// Don't include auto-linking code if the user has disabled it by</span>
+<span class="comment">// defining BOOST_ALL_NO_LIB, or BOOST_MY_LIBRARY_NO_LIB, or if this </span>
+<span class="comment">// is one of our own source files (signified by BOOST_MY_LIBRARY_SOURCE):</span>
+<span class="comment">//</span>
+<span class="preprocessor">#if</span> <span class="special">!</span><span class="identifier">defined</span><span class="special">(</span><span class="identifier">BOOST_ALL_NO_LIB</span><span class="special">)</span> <span class="special">&amp;&amp;</span> <span class="special">!</span><span class="identifier">defined</span><span class="special">(</span><span class="identifier">BOOST_MY_LIBRARY_NO_LIB</span><span class="special">)</span> <span class="special">&amp;&amp;</span> <span class="special">!</span><span class="identifier">defined</span><span class="special">(</span><span class="identifier">BOOST_MY_LIBRARY_SOURCE</span><span class="special">)</span>
 <span class="preprocessor">#  define</span> <span class="identifier">BOOST_LIB_NAME</span> <span class="identifier">boost_my_library</span>
 <span class="preprocessor">#  ifdef</span> <span class="identifier">BOOST_MY_LIBRARY_DYN_LINK</span>
 <span class="preprocessor">#     define</span> <span class="identifier">BOOST_DYN_LINK</span>
@@ -3892,10 +4021,10 @@
 <p>
          <span class="bold"><strong>my_library.cpp</strong></span>
        </p>
-<pre class="programlisting"><span class="comment">// define BOOST_MY_LIBRARY_SOURCE so that the header knows that the
-</span><span class="comment">// library is being built (possibly exporting rather than importing code)
-</span><span class="comment">//
-</span><span class="preprocessor">#define</span> <span class="identifier">BOOST_MY_LIBRARY_SOURCE</span>
+<pre class="programlisting"><span class="comment">// define BOOST_MY_LIBRARY_SOURCE so that the header knows that the</span>
+<span class="comment">// library is being built (possibly exporting rather than importing code)</span>
+<span class="comment">//</span>
+<span class="preprocessor">#define</span> <span class="identifier">BOOST_MY_LIBRARY_SOURCE</span>

 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">my_library</span><span class="special">/</span><span class="identifier">my_library</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="special">...</span>
@@ -3905,7 +4034,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001 -2007 Beman Dawes, Vesa Karvonen, John Maddock<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Beman Dawes, Vesa Karvonen, John
+      Maddock<p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
--- a/doc/html/boost_config/guidelines_for_boost_authors.html
+++ b/doc/html/boost_config/guidelines_for_boost_authors.html
@@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Guidelines for Boost Authors</title>
 <link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.74.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Config">
 <link rel="up" href="../index.html" title="Boost.Config">
 <link rel="prev" href="boost_macro_reference.html" title="Boost Macro Reference">
@@ -22,14 +22,14 @@
 <div class="spirit-nav">
 <a accesskey="p" href="boost_macro_reference.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="rationale.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="boost_config.guidelines_for_boost_authors"></a><a class="link" href="guidelines_for_boost_authors.html" title="Guidelines for Boost Authors">Guidelines for
    Boost Authors</a>
 </h2></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.warnings">
-      Disabling Compiler Warnings</a></span></dt>
+<dt><span class="section"><a href="guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.warnings">Disabling
+      Compiler Warnings</a></span></dt>
 <dt><span class="section"><a href="guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.adding_new_defect_macros">Adding
      New Defect Macros</a></span></dt>
 <dt><span class="section"><a href="guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.adding_new_feature_test_macros">Adding
@@ -61,26 +61,26 @@
 <p>
      Note that:
    </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
          Boost library implementers are not required to "<code class="computeroutput"><span class="preprocessor">#include</span>
          <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>", and are not required in any
          way to support compilers that do not comply with the C++ Standard (ISO/IEC
          14882).
        </li>
-<li>
+<li class="listitem">
          If a library implementer wishes to support some non-conforming compiler,
          or to support some platform specific feature, "<code class="computeroutput"><span class="preprocessor">#include</span>
          <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>" is the preferred way to obtain
          configuration information not available from the standard headers such
          as <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">climits</span><span class="special">&gt;</span></code>, etc.
        </li>
-<li>
+<li class="listitem">
          If configuration information can be deduced from standard headers such
          as <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">climits</span><span class="special">&gt;</span></code>, use those standard headers rather
          than <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>.
        </li>
-<li>
+<li class="listitem">
          Boost files that use macros defined in <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>
          should have sensible, standard conforming, default behavior if the macro
          is not defined. This means that the starting point for porting <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code> to a new platform is simply to define
@@ -88,25 +88,25 @@
          is no sensible default behavior, an #error message should describe the
          problem.
        </li>
-<li>
+<li class="listitem">
          If a Boost library implementer wants something added to <code class="computeroutput"><span class="identifier">config</span><span class="special">.</span><span class="identifier">hpp</span></code>,
          post a request on the Boost mailing list. There is no guarantee such a
          request will be honored; the intent is to limit the complexity of config.hpp.
        </li>
-<li>
+<li class="listitem">
          The intent is to support only compilers which appear on their way to becoming
          C++ Standard compliant, and only recent releases of those compilers at
          that.
        </li>
-<li>
+<li class="listitem">
          The intent is not to disable mainstream features now well-supported by
          the majority of compilers, such as namespaces, exceptions, RTTI, or templates.
        </li>
 </ul></div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_config.guidelines_for_boost_authors.warnings"></a><a class="link" href="guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.warnings" title="Disabling Compiler Warnings">
-      Disabling Compiler Warnings</a>
+<a name="boost_config.guidelines_for_boost_authors.warnings"></a><a class="link" href="guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.warnings" title="Disabling Compiler Warnings">Disabling
+      Compiler Warnings</a>
 </h3></div></div></div>
 <p>
        The header <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">config</span><span class="special">/</span><span class="identifier">warning_disable</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>
@@ -116,17 +116,17 @@
 <p>
        Note that:
      </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
            This header <span class="bold"><strong><span class="emphasis"><em>should never be included
            by another Boost header</em></span></strong></span>, it should only ever be
            used by a library source file or a test case.
          </li>
-<li>
+<li class="listitem">
            The header should be included <span class="bold"><strong><span class="emphasis"><em>before
            you include any other header</em></span></strong></span>.
          </li>
-<li>
+<li class="listitem">
            This header only disables warnings that are hard or impossible to otherwise
            deal with, and which are typically emitted by one compiler only, or in
            one compilers own standard library headers.
@@ -182,7 +182,7 @@
 </tbody>
 </table></div>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_config.guidelines_for_boost_authors.adding_new_defect_macros"></a><a class="link" href="guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.adding_new_defect_macros" title="Adding New Defect Macros">Adding
      New Defect Macros</a>
@@ -206,10 +206,10 @@
        the test case in a <code class="computeroutput"><span class="special">.</span><span class="identifier">ipp</span></code>
        file with the following comments near the top:
      </p>
-<pre class="programlisting"><span class="comment">//  MACRO:         BOOST_NO_FOO
-</span><span class="comment">//  TITLE:         foo
-</span><span class="comment">//  DESCRIPTION:   If the compiler fails to support foo
-</span></pre>
+<pre class="programlisting"><span class="comment">//  MACRO:         BOOST_NO_FOO</span>
+<span class="comment">//  TITLE:         foo</span>
+<span class="comment">//  DESCRIPTION:   If the compiler fails to support foo</span>
+</pre>
 <p>
        These comments are processed by the autoconf script, so make sure the format
        follows the one given. The file should be named "<code class="computeroutput"><span class="identifier">boost_no_foo</span><span class="special">.</span><span class="identifier">ipp</span></code>",
@@ -222,9 +222,9 @@
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost_no_foo</span> <span class="special">{</span>
 <span class="keyword">int</span> <span class="identifier">test</span><span class="special">()</span>
 <span class="special">{</span>
-    <span class="comment">// test code goes here:
-</span>    <span class="comment">//
-</span>    <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
+    <span class="comment">// test code goes here:</span>
+    <span class="comment">//</span>
+    <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
 <span class="special">}</span>

 <span class="special">}</span>
@@ -233,15 +233,15 @@
        Once the test code is in place in libs/config/test, updating the configuration
        test system proceeds as:
      </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
            cd into <code class="computeroutput"><span class="identifier">libs</span><span class="special">/</span><span class="identifier">config</span><span class="special">/</span><span class="identifier">tools</span></code> and run <code class="computeroutput"><span class="identifier">bjam</span></code>.
            This generates the <code class="computeroutput"><span class="special">.</span><span class="identifier">cpp</span></code>
            file test cases from the <code class="computeroutput"><span class="special">.</span><span class="identifier">ipp</span></code> file, updates the libs/config/test/all/Jamfile.v2,
            <code class="computeroutput"><span class="identifier">config_test</span><span class="special">.</span><span class="identifier">cpp</span></code> and <code class="computeroutput"><span class="identifier">config_info</span><span class="special">.</span><span class="identifier">cpp</span></code>.<br>
            <br>
          </li>
-<li>
+<li class="listitem">
            cd into <code class="computeroutput"><span class="identifier">libs</span><span class="special">/</span><span class="identifier">config</span><span class="special">/</span><span class="identifier">test</span><span class="special">/</span><span class="identifier">all</span></code> and run <code class="computeroutput"><span class="identifier">bjam</span>
            </code><span class="emphasis"><em>MACRONAME<code class="computeroutput"> <span class="identifier">compiler</span><span class="special">-</span><span class="identifier">list</span></code></em></span>,
            where <span class="emphasis"><em>MACRONAME</em></span> is the name of the new macro, and
@@ -253,7 +253,7 @@
            is defined when it should not be defined, xxx_fail_test will not report
            <code class="computeroutput"><span class="special">**</span><span class="identifier">passed</span><span class="special">**</span></code>.<br> <br>
          </li>
-<li>
+<li class="listitem">
            cd into <code class="computeroutput"><span class="identifier">libs</span><span class="special">/</span><span class="identifier">config</span><span class="special">/</span><span class="identifier">test</span></code> and run <code class="computeroutput"><span class="identifier">bjam</span>
            <span class="identifier">config_info</span> <span class="identifier">config_test</span>
            </code><span class="emphasis"><em><code class="computeroutput"><span class="identifier">compiler</span><span class="special">-</span><span class="identifier">list</span></code></em></span>.
@@ -266,26 +266,26 @@
 <p>
        Then you should:
      </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
            Define the defect macro in those config headers that require it.
          </li>
-<li>
+<li class="listitem">
            Document the macro in this documentation (please do not forget this step!!)
          </li>
-<li>
+<li class="listitem">
            Commit everything.
          </li>
-<li>
+<li class="listitem">
            Keep an eye on the regression tests for new failures in Boost.Config
            caused by the addition.
          </li>
-<li>
+<li class="listitem">
            Start using the macro.
          </li>
 </ul></div>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_config.guidelines_for_boost_authors.adding_new_feature_test_macros"></a><a class="link" href="guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.adding_new_feature_test_macros" title="Adding New Feature Test Macros">Adding
      New Feature Test Macros</a>
@@ -309,7 +309,7 @@
        <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">unistd</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span></code>).
      </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_config.guidelines_for_boost_authors.modifying_the_boost_configuration_headers"></a><a class="link" href="guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.modifying_the_boost_configuration_headers" title="Modifying the Boost Configuration Headers">Modifying
      the Boost Configuration Headers</a>
@@ -362,7 +362,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001 -2007 Beman Dawes, Vesa Karvonen, John Maddock<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Beman Dawes, Vesa Karvonen, John
+      Maddock<p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
--- a/doc/html/boost_config/rationale.html
+++ b/doc/html/boost_config/rationale.html
@@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Rationale</title>
 <link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.74.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="../index.html" title="Boost.Config">
 <link rel="up" href="../index.html" title="Boost.Config">
 <link rel="prev" href="guidelines_for_boost_authors.html" title="Guidelines for Boost Authors">
@@ -22,7 +22,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="guidelines_for_boost_authors.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="acknowledgements.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="boost_config.rationale"></a><a class="link" href="rationale.html" title="Rationale">Rationale</a>
 </h2></div></div></div>
@@ -39,7 +39,7 @@
      principles from the <a href="http://www.objectmentor.com/resources/articles/Principles_and_Patterns.pdf" target="_top">following
      article</a>.
    </p>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_config.rationale.the_problem"></a><a class="link" href="rationale.html#boost_config.rationale.the_problem" title="The problem">The problem</a>
 </h3></div></div></div>
@@ -90,7 +90,7 @@
        code must be provided.
      </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_config.rationale.the_solution"></a><a class="link" href="rationale.html#boost_config.rationale.the_solution" title="The solution">The solution</a>
 </h3></div></div></div>
@@ -109,7 +109,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2001 -2007 Beman Dawes, Vesa Karvonen, John Maddock<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Beman Dawes, Vesa Karvonen, John
+      Maddock<p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Boost.Config</title>
 <link rel="stylesheet" href="../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.74.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="Boost.Config">
 <link rel="next" href="boost_config/boost_macro_reference.html" title="Boost Macro Reference">
 </head>
@@ -18,7 +18,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav"><a accesskey="n" href="boost_config/boost_macro_reference.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a></div>
-<div class="article" lang="en">
+<div class="article">
 <div class="titlepage">
 <div>
 <div><h2 class="title">
@@ -26,9 +26,10 @@
 <div><div class="authorgroup"><div class="author"><h3 class="author">
 <span class="firstname">Vesa Karvonen, John Maddock</span> <span class="surname">Beman Dawes</span>
 </h3></div></div></div>
-<div><p class="copyright">Copyright &#169; 2001 -2007 Beman Dawes, Vesa Karvonen, John Maddock</p></div>
+<div><p class="copyright">Copyright &#169; 2001-2007 Beman Dawes, Vesa Karvonen, John
+      Maddock</p></div>
 <div><div class="legalnotice">
-<a name="id663915"></a><p>
+<a name="id988561"></a><p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
@@ -57,14 +58,16 @@
 </dl></dd>
 <dt><span class="section"><a href="boost_config/boost_macro_reference.html">Boost Macro Reference</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="boost_config/boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_defects">Macros
-      that describe defects</a></span></dt>
+<dt><span class="section"><a href="boost_config/boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_c__03_defects">Macros
+      that describe C++03 defects</a></span></dt>
 <dt><span class="section"><a href="boost_config/boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_optional_features">Macros
      that describe optional features</a></span></dt>
-<dt><span class="section"><a href="boost_config/boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_possible_c__0x_features">Macros
-      that describe possible C++0x features</a></span></dt>
-<dt><span class="section"><a href="boost_config/boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_c__0x_features_not_supported">Macros
-      that describe C++0x features not supported</a></span></dt>
+<dt><span class="section"><a href="boost_config/boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_possible_c___future_features">Macros
+      that describe possible C++ future features</a></span></dt>
+<dt><span class="section"><a href="boost_config/boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_c__11_features_not_supported">Macros
+      that describe C++11 features not supported</a></span></dt>
+<dt><span class="section"><a href="boost_config/boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_allow_use_of_c__11_features_with_c__03_compilers">Macros
+      that allow use of C++11 features with C++03 compilers</a></span></dt>
 <dt><span class="section"><a href="boost_config/boost_macro_reference.html#boost_config.boost_macro_reference.boost_helper_macros">Boost
      Helper Macros</a></span></dt>
 <dt><span class="section"><a href="boost_config/boost_macro_reference.html#boost_config.boost_macro_reference.boost_informational_macros">Boost
@@ -75,8 +78,8 @@
 <dt><span class="section"><a href="boost_config/guidelines_for_boost_authors.html">Guidelines for
    Boost Authors</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="boost_config/guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.warnings">
-      Disabling Compiler Warnings</a></span></dt>
+<dt><span class="section"><a href="boost_config/guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.warnings">Disabling
+      Compiler Warnings</a></span></dt>
 <dt><span class="section"><a href="boost_config/guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.adding_new_defect_macros">Adding
      New Defect Macros</a></span></dt>
 <dt><span class="section"><a href="boost_config/guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.adding_new_feature_test_macros">Adding
@@ -92,7 +95,7 @@
 <dt><span class="section"><a href="boost_config/acknowledgements.html">Acknowledgements</a></span></dt>
 </dl>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="boost_config.configuring_boost_for_your_platform"></a><a class="link" href="index.html#boost_config.configuring_boost_for_your_platform" title="Configuring Boost for Your Platform">Configuring
    Boost for Your Platform</a>
@@ -111,7 +114,7 @@
 <dt><span class="section"><a href="index.html#boost_config.configuring_boost_for_your_platform.testing_the_boost_configuration">Testing
      the boost configuration</a></span></dt>
 </dl></div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_config.configuring_boost_for_your_platform.using_the_default_boost_configuration"></a><a class="link" href="index.html#boost_config.configuring_boost_for_your_platform.using_the_default_boost_configuration" title="Using the default boost configuration">Using
      the default boost configuration</a>
@@ -135,7 +138,7 @@
        and submitting a support request.
      </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_config.configuring_boost_for_your_platform.the__boost_config_hpp__header"></a><a class="link" href="index.html#boost_config.configuring_boost_for_your_platform.the__boost_config_hpp__header" title="The &lt;boost/config.hpp&gt; header">The
      &lt;boost/config.hpp&gt; header</a>
@@ -166,11 +169,9 @@
        developers list.
      </p>
 </div>
-<a name="config_config_script"></a><p>
-    </p>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_config.configuring_boost_for_your_platform.using_the_configure_script"></a><a class="link" href="index.html#boost_config.configuring_boost_for_your_platform.using_the_configure_script" title="Using the configure script">Using
+<a name="boost_config.configuring_boost_for_your_platform.using_the_configure_script"></a><a name="config_config_script"></a><a class="link" href="index.html#boost_config.configuring_boost_for_your_platform.using_the_configure_script" title="Using the configure script">Using
      the configure script</a>
 </h3></div></div></div>
 <div class="important"><table border="0" summary="Important">
@@ -289,15 +290,15 @@
        (located under <span class="emphasis"><em>&lt;boost-root&gt;</em></span><code class="computeroutput"><span class="special">/</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">config</span><span class="special">/</span></code>).
        There are two ways you can use this header:
      </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
            <span class="bold"><strong>Option 1:</strong></span> copy the header into <span class="emphasis"><em>&lt;boost-root&gt;</em></span><code class="computeroutput"><span class="special">/</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">config</span><span class="special">/</span></code> so that it replaces the default user.hpp
            provided by boost. This option allows only one configure-generated setup;
            boost developers should avoid this option, as it incurs the danger of
            accidentally committing a configure-modified <a href="../../../../boost/config/user.hpp" target="_top">&lt;boost/config/user.hpp&gt;</a>
            to the cvs repository (something you will not be thanked for!).
          </li>
-<li>
+<li class="listitem">
            <span class="bold"><strong>Option 2:</strong></span> give the header a more memorable
            name, and place it somewhere convenient; then, define the macro <code class="computeroutput"><span class="identifier">BOOST_USER_CONFIG</span></code> to point to it. For
            example create a new sub-directory <span class="emphasis"><em>&lt;boost-root&gt;</em></span><code class="computeroutput"><span class="special">/</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">config</span><span class="special">/</span></code> <code class="computeroutput"><span class="identifier">user</span><span class="special">/</span></code>, and copy the header there; for example
@@ -310,11 +311,9 @@
          </li>
 </ul></div>
 </div>
-<a name="config_user_settable"></a><p>
-    </p>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_config.configuring_boost_for_your_platform.user_settable_options"></a><a class="link" href="index.html#boost_config.configuring_boost_for_your_platform.user_settable_options" title="User settable options">User
+<a name="boost_config.configuring_boost_for_your_platform.user_settable_options"></a><a name="config_user_settable"></a><a class="link" href="index.html#boost_config.configuring_boost_for_your_platform.user_settable_options" title="User settable options">User
      settable options</a>
 </h3></div></div></div>
 <p>
@@ -678,7 +677,7 @@
 </tbody>
 </table></div>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_config.configuring_boost_for_your_platform.advanced_configuration_usage"></a><a class="link" href="index.html#boost_config.configuring_boost_for_your_platform.advanced_configuration_usage" title="Advanced configuration usage">Advanced
      configuration usage</a>
@@ -722,7 +721,7 @@
 <p>
        The following usage examples represent just a few of the possibilities:
      </p>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="boost_config.configuring_boost_for_your_platform.advanced_configuration_usage.example_1__creating_our_own_frozen_configuration"></a><a class="link" href="index.html#boost_config.configuring_boost_for_your_platform.advanced_configuration_usage.example_1__creating_our_own_frozen_configuration" title="Example 1, creating our own frozen configuration">Example
        1, creating our own frozen configuration</a>
@@ -754,7 +753,7 @@
          yet supported by boost.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="boost_config.configuring_boost_for_your_platform.advanced_configuration_usage.example_2__skipping_files_that_you_don_t_need"></a><a class="link" href="index.html#boost_config.configuring_boost_for_your_platform.advanced_configuration_usage.example_2__skipping_files_that_you_don_t_need" title="Example 2: skipping files that you don't need">Example
        2: skipping files that you don't need</a>
@@ -773,7 +772,7 @@
          a dependency on two boost headers.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="boost_config.configuring_boost_for_your_platform.advanced_configuration_usage.example_3__using_configure_script_to_freeze_the_boost_configuration"></a><a class="link" href="index.html#boost_config.configuring_boost_for_your_platform.advanced_configuration_usage.example_3__using_configure_script_to_freeze_the_boost_configuration" title="Example 3: using configure script to freeze the boost configuration">Example
        3: using configure script to freeze the boost configuration</a>
@@ -786,7 +785,7 @@
        </p>
 </div>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_config.configuring_boost_for_your_platform.testing_the_boost_configuration"></a><a class="link" href="index.html#boost_config.configuring_boost_for_your_platform.testing_the_boost_configuration" title="Testing the boost configuration">Testing
      the boost configuration</a>
@@ -950,7 +949,7 @@
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: November 23, 2010 at 03:21:20 GMT</small></p></td>
+<td align="left"><p><small>Last revised: October 11, 2011 at 17:21:29 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
--- a/doc/macro_reference.qbk
+++ b/doc/macro_reference.qbk
@@ -16,11 +16,11 @@

 [#config_defects]

-[section Macros that describe defects]
+[section Macros that describe C++03 defects]

-The following macros all describe features that are required by the C++ standard,
+The following macros all describe features that are required by the C++03 standard,
 if one of the following macros is defined, then it represents a defect in the
-compiler's conformance with the standard.
+compiler's conformance with the 2003 standard.


 [table
@@ -71,6 +71,11 @@ The Platform does not provide `<wchar.h>` and `<cwchar>`.
 [[`BOOST_NO_CWCTYPE`][Platform][
 The Platform does not provide `<wctype.h>` and `<cwctype>`.
 ]]
+[[`BOOST_NO_FENV_H`][Platform, Standard library][
+The C standard library doesn't provide `<fenv.h>`. [@../../../../boost/detail/fenv.hpp
+`<boost/detail/fenv.hpp>`] should be included instead of `<fenv.h>` for maximum
+portability on platforms which do provide `<fenv.h>`. 
+]]
 [[`BOOST_NO_DEPENDENT_NESTED_DERIVATIONS`][Compiler][
 The compiler fails to compile a nested class that has a dependent base class:
 ``
@@ -343,7 +348,10 @@ The platform has the POSIX header `<dirent.h>`.
 The platform has the functions `expm1`, `expm1f` and `expm1l` in `<math.h>`
 ]]
 [[`BOOST_HAS_FTIME`][Platform][
-The platform has the Win32 API `GetSystemTimeAsFileTime`.
+The platform has the Win32 API type FTIME.
+]]
+[[`BOOST_HAS_GETSYSTEMTIMEASFILETIME`][Platform][
+The platform has the Win32 API GetSystemTimeAsFileTime.
 ]]
 [[`BOOST_HAS_GETTIMEOFDAY`][Platform][
 The platform has the POSIX API `gettimeofday`.
@@ -399,11 +407,6 @@ The platform has the POSIX API `sched_yield`.
 [[`BOOST_HAS_SGI_TYPE_TRAITS`][Compiler, Standard library][
 The compiler has native support for SGI style type traits.
 ]]
-[[`BOOST_HAS_FENV_H`][Platform, Standard library][
-The platform has a `<fenv.h>`. [@../../../../boost/detail/fenv.hpp
-`<boost/detail/fenv.hpp>`] should be included instead of `<fenv.h>` for maximum
-portability. 
-]]
 [[`BOOST_HAS_STDINT_H`][Platform][
 The platform has a `<stdint.h>`
 ]]
@@ -511,11 +514,10 @@ standard).

 [endsect]

-[section Macros that describe possible C++0x features]
+[section Macros that describe possible C++ future features]

-The following macros describe features that are likely to be included in the
-upcoming ISO C++ standard, C++0x, but have not yet been approved for inclusion
-in the language.
+The following macros describe features that may be included in some future
+ISO C++ standard, but have not yet been approved for inclusion in the language.


 [table
@@ -528,9 +530,9 @@ The compiler supports  concepts.

 [endsect]

-[section Macros that describe C++0x features not supported]
+[section Macros that describe C++11 features not supported]

-The following macros describe features in the upcoming ISO C++ standard, C++0x,
+The following macros describe features in the 2011 ISO C++ standard, formerly known as C++0x,
 that are not yet supported by a particular compiler or library.

 [table
@@ -539,14 +541,10 @@ that are not yet supported by a particular compiler or library.
 [[`BOOST_NO_0X_HDR_ARRAY`][The standard library does not provide header <array>.]]
 [[`BOOST_NO_0X_HDR_CHRONO`][The standard library does not provide header <chrono>.]]
 [[`BOOST_NO_0X_HDR_CODECVT`][The standard library does not provide header <codecvt>.]]
-[[`BOOST_NO_0X_HDR_CONCEPTS`][The standard library does not provide header <concepts>.]]
 [[`BOOST_NO_0X_HDR_CONDITION_VARIABLE`][The standard library does not provide header <condition_variable>.]]
-[[`BOOST_NO_0X_HDR_CONTAINER_CONCEPTS`][The standard library does not provide header <container_concepts>.]]
 [[`BOOST_NO_0X_HDR_FORWARD_LIST`][The standard library does not provide header <forward_list>.]]
 [[`BOOST_NO_0X_HDR_FUTURE`][The standard library does not provide header <future>.]]
 [[`BOOST_NO_0X_HDR_INITIALIZER_LIST`][The standard library does not provide header <initializer_list>.]]
-[[`BOOST_NO_0X_HDR_ITERATOR_CONCEPTS`][The standard library does not provide header <iterator_concepts>.]]
-[[`BOOST_NO_0X_HDR_MEMORY_CONCEPTS`][The standard library does not provide header <memory_concepts>.]]
 [[`BOOST_NO_0X_HDR_MUTEX`][The standard library does not provide header <mutex>.]]
 [[`BOOST_NO_0X_HDR_RANDOM`][The standard library does not provide header <random>.]]
 [[`BOOST_NO_0X_HDR_RATIO`][The standard library does not provide header <ratio>.]]
@@ -571,8 +569,6 @@ type `char16_t`.
 [[`BOOST_NO_CHAR32_T`][The compiler does not support 
 type `char32_t`. 
 ]]                       
-[[`BOOST_NO_CONCEPTS`][The compiler does not support Concepts. 
-]]                      
 [[`BOOST_NO_TEMPLATE_ALIASES`][The compiler does not support template aliases. 
 ]]                      
 [[`BOOST_NO_CONSTEXPR`][The compiler does not support 
@@ -581,6 +577,10 @@ type `char32_t`.
 [[`BOOST_NO_DECLTYPE`][The compiler does not support 
 `decltype`. 
 ]]                       
+[[`BOOST_NO_DECLTYPE_N3276`][The compiler does not support the extension to
+`decltype` described in [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3276.pdf N3276],
+accepted in Madrid, March 2011.
+]]                       
 [[`BOOST_NO_DEFAULTED_FUNCTIONS`][The compiler does not support 
 defaulted (`= default`) functions.  
 ]]            
@@ -603,7 +603,9 @@ The C++ compiler does not support C++0x initializer lists.
 ]]                      
 [[`BOOST_NO_LONG_LONG`][The compiler does not support `long long`.
 ]]                
-[[`BOOST_NO_NULLPTR`][The compiler does not support 'nullptr'. 
+[[`BOOST_NO_NOEXCEPT`][The compiler does not support `noexcept`. 
+]]                      
+[[`BOOST_NO_NULLPTR`][The compiler does not support `nullptr`. 
 ]]                      
 [[`BOOST_NO_RAW_LITERALS`][The compiler does not support
 raw string literals. 
@@ -624,7 +626,10 @@ scoped enumerations (`enum class`).
 ]]                      
 [[`BOOST_NO_UNICODE_LITERALS`][The compiler does not support
 Unicode (`u8`, `u`, `U`) literals. 
-]]               
+]] 
+[[`BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX`][The compiler does not support
+the [@http://en.wikipedia.org/wiki/C%2B%2B0x#Uniform_initialization C++11 Unified Initialization Syntax].
+]]
 [[`BOOST_NO_VARIADIC_TEMPLATES`][The compiler does not support
 variadic templates. 
 ]]
@@ -635,6 +640,76 @@ variadic macros.

 [endsect]

+[#config_11_for_03]
+
+[section Macros that allow use of C++11 features with C++03 compilers]
+
+The following macros allow use of C++11 features even with compilers that do not yet
+provide compliant C++11 support.
+
+[table
+[[Macro        ][Section     ][ Description          ]]
+
+[[`BOOST_CONSTEXPR`][
+Some compilers don't support the use of `constexpr`. This macro expands to nothing on those compilers, and `constexpr`
+elsewhere. For example, when defining a constexpr function or constructor replace:
+``
+  constexpr tuple();
+``
+with:
+``
+  BOOST_CONSTEXPR tuple();
+``
+]]
+[[`BOOST_CONSTEXPR_OR_CONST`][
+Some compilers don't support the use of `constexpr`. This macro expands to `const` on those compilers, and `constexpr`
+elsewhere. For example, when defining const expr variables replace:
+``
+  static constexpr UIntType xor_mask = a;
+``
+with:
+``
+  static BOOST_CONSTEXPR_OR_CONST UIntType xor_mask = a;
+``
+]]
+[[`BOOST_STATIC_CONSTEXPR`][
+This is a shortcut for `static BOOST_CONSTEXPR_OR_CONST`For example, when defining const expr variables replace:
+``
+  static constexpr UIntType xor_mask = a;
+``
+with:
+``
+  BOOST_STATIC_CONSTEXPR UIntType xor_mask = a;
+``
+]]
+[[
+``
+  BOOST_NOEXCEPT
+  BOOST_NOEXCEPT_IF(Predicate)
+  BOOST_NOEXCEPT_EXPR(Expression)
+``
+][
+If `BOOST_NO_NOEXCEPT` is defined (i.e. C++03 compliant compilers) these macros are defined as:
+[:
+``
+  #define BOOST_NOEXCEPT
+  #define BOOST_NOEXCEPT_IF(Predicate)
+  #define BOOST_NOEXCEPT_EXPR(Expression) false
+``
+]
+If `BOOST_NO_NOEXCEPT` is not defined (i.e. C++11 compliant compilers) they are defined as:
+[:
+``
+  #define BOOST_NOEXCEPT noexcept
+  #define BOOST_NOEXCEPT_IF(Predicate) noexcept((Predicate))
+  #define BOOST_NOEXCEPT_EXPR(Expression) noexcept((Expression))
+``
+]
+]]
+]
+
+[endsect]
+
 [#config_helpers]

 [section Boost Helper Macros]
@@ -674,6 +749,17 @@ of `__BORLANDC__` /unless/ the macro `BOOST_DETECT_OUTDATED_WORKAROUNDS` is defi

 [*Note]: the ultimate source of documentation for this macro is in [@../../../../boost/detail/workaround.hpp boost/detail/workaround.hpp].
 ]]
+[[`BOOST_PREVENT_MACRO_SUBSTITUTION`][
+Sometimes you have a function name with the same name as a C macro, for example "min" and "max"
+member functions, in which case one can prevent the function being expanded as a macro using:
+``
+someclass.min BOOST_PREVENT_MACRO_SUBSTITUTION(arg1, arg2);
+``
+The following also works in most, but not all, contexts:
+``
+(someclass.max)(arg1, arg2);
+``
+]]
 [[`BOOST_DEDUCED_TYPENAME`][
 Some compilers don't support the use of typename for dependent types in deduced
 contexts. This macro expands to nothing on those compilers, and typename
@@ -803,37 +889,25 @@ the arguments is itself a macro (see 16.3.1 in C++ standard). This is normally
 used to create a mangled name in combination with a predefined macro such a
 \_\_LINE__.
 ]]
-[[`BOOST_CONSTEXPR`][
-Some compilers don't support the use of `constexpr`. This macro expands to nothing on those compilers, and `constexpr`
-elsewhere. For example, when defining a constexpr function or constructor replace:
+[[`BOOST_FORCEINLINE`][
+This macro can be used in place of the `inline` keyword to instruct the compiler
+that a function should always be inlined.
+Overuse of this macro can lead to significant bloat, while good use can increase
+performance in certain cases, such as computation-intensive code built through
+generative programming techniques.
+
+Usage example:
 ``
-  constexpr tuple();
-``
-with:
-``
-  BOOST_CONSTEXPR tuple();
-``
-]]
-[[`BOOST_CONSTEXPR_OR_CONST`][
-Some compilers don't support the use of `constexpr`. This macro expands to `const` on those compilers, and `constexpr`
-elsewhere. For example, when defining const expr variables replace:
-``
-  static constexpr UIntType xor_mask = a;
-``
-with:
-``
-  static BOOST_CONSTEXPR_OR_CONST UIntType xor_mask = a;
-``
-]]
-[[`BOOST_STATIC_CONSTEXPR`][
-This is a shortcut for `static BOOST_CONSTEXPR_OR_CONST`For example, when defining const expr variables replace:
-``
-  static constexpr UIntType xor_mask = a;
-``
-with:
-``
-  BOOST_STATIC_CONSTEXPR UIntType xor_mask = a;
+  template<class T>
+  BOOST_FORCEINLINE T& f(T& t)
+  {
+      return t;
+  }
 ``
+
+Note that use of this macro can lead to cryptic error messages with some compilers.
+Consider defining it to `inline` before including the Boost.Config header in order to be
+able to debug errors more easily.
 ]]
 ]

@@ -880,7 +954,7 @@ compiler version macro.
 Defined to 1 if the compiler is the Clang compiler.
 ]]
 [[`BOOST_WINDOWS`][`<boost/config.hpp>`][
-Defined if the Windows platfrom API is available.
+Defined if the Windows platform API is available.
 ]]
 [[`BOOST_DINKUMWARE_STDLIB`][`<boost/config.hpp>`][
 Defined if the dinkumware standard library is in use, takes the same value
--- a/include/boost/config.hpp
+++ b/include/boost/config.hpp
@@ -36,7 +36,7 @@
 #endif

 // if we don't have a std library config set, try and find one:
-#if !defined(BOOST_STDLIB_CONFIG) && !defined(BOOST_NO_STDLIB_CONFIG) && !defined(BOOST_NO_CONFIG)
+#if !defined(BOOST_STDLIB_CONFIG) && !defined(BOOST_NO_STDLIB_CONFIG) && !defined(BOOST_NO_CONFIG) && defined(__cplusplus)
 #  include <boost/config/select_stdlib_config.hpp>
 #endif
 // if we have a std library config, include it now:
--- a/include/boost/config/auto_link.hpp
+++ b/include/boost/config/auto_link.hpp
@@ -145,11 +145,16 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
   // vc90:
 #  define BOOST_LIB_TOOLSET "vc90"

-#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1600)
+#elif defined(BOOST_MSVC) && (BOOST_MSVC == 1600)

   // vc10:
 #  define BOOST_LIB_TOOLSET "vc100"

+#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1700)
+
+   // vc11:
+#  define BOOST_LIB_TOOLSET "vc110"
+
 #elif defined(__BORLANDC__)

   // CBuilder 6:
@@ -364,7 +369,7 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 #ifdef BOOST_AUTO_LINK_TAGGED
 #  pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib")
 #  ifdef BOOST_LIB_DIAGNOSTIC
-#     pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib")
+#     pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib")
 #  endif
 #elif defined(BOOST_AUTO_LINK_NOMANGLE)
 #  pragma comment(lib, BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib")
--- a/include/boost/config/compiler/borland.hpp
+++ b/include/boost/config/compiler/borland.hpp
@@ -12,9 +12,6 @@
 //
 // versions check:
 // we don't support Borland prior to version 5.4:
-
-#define BOOST_BORLAND __BORLANDC__
-
 #if __BORLANDC__ < 0x540
 #  error "Compiler not supported or configured - please reconfigure"
 #endif
@@ -59,8 +56,13 @@
 #  define BOOST_NO_CV_VOID_SPECIALIZATIONS
 #  define BOOST_NO_DEDUCED_TYPENAME
 // workaround for missing WCHAR_MAX/WCHAR_MIN:
+#ifdef __cplusplus
 #include <climits>
 #include <cwchar>
+#else
+#include <limits.h>
+#include <wchar.h>
+#endif // __cplusplus
 #ifndef WCHAR_MAX
 #  define WCHAR_MAX 0xffff
 #endif
@@ -72,7 +74,7 @@
 // Borland C++ Builder 6 and below:
 #if (__BORLANDC__ <= 0x564)

-#  ifdef NDEBUG
+#  if defined(NDEBUG) && defined(__cplusplus)
      // fix broken <cstring> so that Boost.test works:
 #     include <cstring>
 #     undef strcmp
@@ -169,8 +171,8 @@

 #define BOOST_NO_AUTO_DECLARATIONS
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
@@ -184,6 +186,8 @@
 #define BOOST_NO_TEMPLATE_ALIASES
 #define BOOST_NO_UNICODE_LITERALS    // UTF-8 still not supported
 #define BOOST_NO_VARIADIC_TEMPLATES
+#define BOOST_NO_NOEXCEPT
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX

 #if __BORLANDC__ >= 0x590
 #  define BOOST_HAS_TR1_HASH
@@ -278,3 +282,4 @@



+
--- a/include/boost/config/compiler/clang.hpp
+++ b/include/boost/config/compiler/clang.hpp
@@ -13,8 +13,7 @@
 #  define BOOST_NO_EXCEPTIONS
 #endif

-#if __has_feature(cxx_rtti)
-#else
+#if !__has_feature(cxx_rtti)
 #  define BOOST_NO_RTTI
 #endif

@@ -24,35 +23,94 @@

 #define BOOST_HAS_NRVO

-// NOTE: Clang's C++0x support is not worth detecting. However, it
-// supports both extern templates and "long long" even in C++98/03
-// mode.
-#define BOOST_NO_AUTO_DECLARATIONS
-#define BOOST_NO_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CHAR16_T
-#define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONCEPTS
-#define BOOST_NO_CONSTEXPR
-#define BOOST_NO_DECLTYPE
-#define BOOST_NO_DEFAULTED_FUNCTIONS
-#define BOOST_NO_DELETED_FUNCTIONS
-#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_INITIALIZER_LISTS
-#define BOOST_NO_LAMBDAS
-#define BOOST_NO_NULLPTR
-#define BOOST_NO_RAW_LITERALS
-#define BOOST_NO_RVALUE_REFERENCES
-#define BOOST_NO_SCOPED_ENUMS
-#define BOOST_NO_STATIC_ASSERT
-#define BOOST_NO_TEMPLATE_ALIASES
-#define BOOST_NO_UNICODE_LITERALS
-#define BOOST_NO_VARIADIC_TEMPLATES
-#define BOOST_NO_VARIADIC_MACROS
+// Clang supports "long long" in all compilation modes.

-// HACK: Clang does support extern templates, but Boost's test for
-// them is wrong.
-#define BOOST_NO_EXTERN_TEMPLATE
+#if !__has_feature(cxx_auto_type)
+#  define BOOST_NO_AUTO_DECLARATIONS
+#  define BOOST_NO_AUTO_MULTIDECLARATIONS
+#endif
+
+#if !(defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L)
+#  define BOOST_NO_CHAR16_T
+#  define BOOST_NO_CHAR32_T
+#endif
+
+#if !__has_feature(cxx_constexpr)
+#  define BOOST_NO_CONSTEXPR
+#endif
+
+#if !__has_feature(cxx_decltype)
+#  define BOOST_NO_DECLTYPE
+#endif
+
+#define BOOST_NO_DECLTYPE_N3276
+
+#if !__has_feature(cxx_defaulted_functions)
+#  define BOOST_NO_DEFAULTED_FUNCTIONS
+#endif
+
+#if !__has_feature(cxx_deleted_functions)
+#  define BOOST_NO_DELETED_FUNCTIONS
+#endif
+
+#if !__has_feature(cxx_explicit_conversions)
+#  define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#endif
+
+#if !__has_feature(cxx_default_function_template_args)
+#  define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#endif
+
+#if !__has_feature(cxx_generalized_initializers)
+#  define BOOST_NO_INITIALIZER_LISTS
+#endif
+
+#if !__has_feature(cxx_lambdas)
+#  define BOOST_NO_LAMBDAS
+#endif
+
+#if !__has_feature(cxx_noexcept)
+#  define BOOST_NO_NOEXCEPT
+#endif
+
+#if !__has_feature(cxx_nullptr)
+#  define BOOST_NO_NULLPTR
+#endif
+
+#if !__has_feature(cxx_raw_string_literals)
+#  define BOOST_NO_RAW_LITERALS
+#endif
+
+#if !__has_feature(cxx_generalized_initializers)
+#  define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#endif
+
+#if !__has_feature(cxx_rvalue_references)
+#  define BOOST_NO_RVALUE_REFERENCES
+#endif
+
+#if !__has_feature(cxx_strong_enums)
+#  define BOOST_NO_SCOPED_ENUMS
+#endif
+
+#if !__has_feature(cxx_static_assert)
+#  define BOOST_NO_STATIC_ASSERT
+#endif
+
+#if !__has_feature(cxx_alias_templates)
+#  define BOOST_NO_TEMPLATE_ALIASES
+#endif
+
+#if !__has_feature(cxx_unicode_literals)
+#  define BOOST_NO_UNICODE_LITERALS
+#endif
+
+#if !__has_feature(cxx_variadic_templates)
+#  define BOOST_NO_VARIADIC_TEMPLATES
+#endif
+
+// Clang always supports variadic macros
+// Clang always supports extern templates

 #ifndef BOOST_COMPILER
 #  define BOOST_COMPILER "Clang version " __clang_version__
--- a/include/boost/config/compiler/codegear.hpp
+++ b/include/boost/config/compiler/codegear.hpp
@@ -60,7 +60,7 @@
 // (Niels Dekker, LKEB, April 2010)
 #  define BOOST_NO_COMPLETE_VALUE_INITIALIZATION

-#  ifdef NDEBUG
+#  if defined(NDEBUG) && defined(__cplusplus)
      // fix broken <cstring> so that Boost.test works:
 #     include <cstring>
 #     undef strcmp
@@ -93,7 +93,6 @@

 #define BOOST_NO_AUTO_DECLARATIONS
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
@@ -101,6 +100,7 @@
 #define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #define BOOST_NO_INITIALIZER_LISTS
 #define BOOST_NO_LAMBDAS
+#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_NULLPTR
 #define BOOST_NO_RAW_LITERALS
 #define BOOST_NO_RVALUE_REFERENCES
@@ -108,6 +108,7 @@
 #define BOOST_NO_TEMPLATE_ALIASES
 #define BOOST_NO_UNICODE_LITERALS
 #define BOOST_NO_VARIADIC_TEMPLATES
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX

 //
 // TR1 macros:
--- a/include/boost/config/compiler/comeau.hpp
+++ b/include/boost/config/compiler/comeau.hpp
@@ -14,8 +14,6 @@

 #include "boost/config/compiler/common_edg.hpp"

-#define BOOST_COMO __COMO_VERSION__
-
 #if (__COMO_VERSION__ <= 4245)

 #  if defined(_MSC_VER) && _MSC_VER <= 1300
--- a/include/boost/config/compiler/common_edg.hpp
+++ b/include/boost/config/compiler/common_edg.hpp
@@ -74,14 +74,15 @@
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
 #define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #define BOOST_NO_LAMBDAS
+#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_NULLPTR
 #define BOOST_NO_RAW_LITERALS
 #define BOOST_NO_RVALUE_REFERENCES
@@ -91,6 +92,7 @@
 #define BOOST_NO_TEMPLATE_ALIASES
 #define BOOST_NO_UNICODE_LITERALS
 #define BOOST_NO_VARIADIC_TEMPLATES
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX

 #ifdef c_plusplus
 // EDG has "long long" in non-strict mode
--- a/include/boost/config/compiler/cray.hpp
+++ b/include/boost/config/compiler/cray.hpp
@@ -0,0 +1,61 @@
+//  (C) Copyright John Maddock 2011.
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for most recent version.
+
+//  Greenhills C compiler setup:
+
+#define BOOST_COMPILER "Cray C version " BOOST_STRINGIZE(_RELEASE)
+
+#if _RELEASE < 7
+#  error "Boost is not configured for Cray compilers prior to version 7, please try the configure script."
+#endif
+
+//
+// Check this is a recent EDG based compiler, otherwise we don't support it here:
+//
+#ifndef __EDG_VERSION__
+#  error "Unsupported Cray compiler, please try running the configure script."
+#endif
+
+#include "boost/config/compiler/common_edg.hpp"
+
+//
+// Cray peculiarities, probably version 7 specific:
+//
+#undef BOOST_NO_AUTO_DECLARATIONS
+#undef BOOST_NO_AUTO_MULTIDECLARATIONS
+#define BOOST_HAS_NRVO
+#define BOOST_NO_VARIADIC_TEMPLATES
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#define BOOST_NO_UNICODE_LITERALS
+#define BOOST_NO_TWO_PHASE_NAME_LOOKUP
+#define BOOST_HAS_NRVO
+#define BOOST_NO_TEMPLATE_ALIASES
+#define BOOST_NO_STATIC_ASSERT
+#define BOOST_NO_SFINAE_EXPR
+#define BOOST_NO_SCOPED_ENUMS
+#define BOOST_NO_RVALUE_REFERENCES
+#define BOOST_NO_RAW_LITERALS
+#define BOOST_NO_NULLPTR
+#define BOOST_NO_NOEXCEPT
+#define BOOST_NO_LAMBDAS
+#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#define BOOST_NO_DELETED_FUNCTIONS
+#define BOOST_NO_DEFAULTED_FUNCTIONS
+#define BOOST_NO_DECLTYPE_N3276
+#define BOOST_NO_DECLTYPE
+#define BOOST_NO_CONSTEXPR
+#define BOOST_NO_COMPLETE_VALUE_INITIALIZATION
+#define BOOST_NO_CHAR32_T
+#define BOOST_NO_CHAR16_T
+//#define BOOST_BCB_PARTIAL_SPECIALIZATION_BUG
+#define BOOST_MATH_DISABLE_STD_FPCLASSIFY
+//#define BOOST_HAS_FPCLASSIFY
+
+#define BOOST_SP_USE_PTHREADS 
+#define BOOST_AC_USE_PTHREADS 
+
--- a/include/boost/config/compiler/digitalmars.hpp
+++ b/include/boost/config/compiler/digitalmars.hpp
@@ -44,7 +44,9 @@
 //
 // Is this really the best way to detect whether the std lib is in namespace std?
 //
+#ifdef __cplusplus
 #include <cstddef>
+#endif
 #if !defined(__STL_IMPORT_VENDOR_CSTD) && !defined(_STLP_IMPORT_VENDOR_CSTD)
 #  define BOOST_NO_STDC_NAMESPACE
 #endif
@@ -62,15 +64,16 @@
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
 #define BOOST_NO_EXTERN_TEMPLATE
 #define BOOST_NO_INITIALIZER_LISTS
 #define BOOST_NO_LAMBDAS
+#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_NULLPTR
 #define BOOST_NO_RAW_LITERALS
 #define BOOST_NO_RVALUE_REFERENCES
@@ -80,6 +83,8 @@
 #define BOOST_NO_TEMPLATE_ALIASES
 #define BOOST_NO_UNICODE_LITERALS
 #define BOOST_NO_VARIADIC_TEMPLATES
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+
 #if (__DMC__ < 0x812)
 #define BOOST_NO_VARIADIC_MACROS
 #endif
--- a/include/boost/config/compiler/gcc.hpp
+++ b/include/boost/config/compiler/gcc.hpp
@@ -89,6 +89,7 @@
 # define BOOST_NO_EXCEPTIONS
 #endif

+
 //
 // Threading support: Turn this on unconditionally here (except for
 // those platforms where we can know for sure). It will get turned off again
@@ -167,7 +168,7 @@

 // Variadic templates compiler: 
 //   http://www.generic-programming.org/~dgregor/cpp/variadic-templates.html
-#  ifdef __VARIADIC_TEMPLATES
+#  if defined(__VARIADIC_TEMPLATES) || (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4) && defined(__GXX_EXPERIMENTAL_CXX0X__))
 #    define BOOST_HAS_VARIADIC_TMPL
 #  else
 #    define BOOST_NO_VARIADIC_TEMPLATES
@@ -181,25 +182,16 @@
 #  define BOOST_NO_AUTO_MULTIDECLARATIONS
 #  define BOOST_NO_CHAR16_T
 #  define BOOST_NO_CHAR32_T
+#  define BOOST_NO_INITIALIZER_LISTS
 #  define BOOST_NO_DEFAULTED_FUNCTIONS
 #  define BOOST_NO_DELETED_FUNCTIONS
-#  define BOOST_NO_INITIALIZER_LISTS
-#  define BOOST_NO_SCOPED_ENUMS  
 #endif

 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4)
 #  define BOOST_NO_SFINAE_EXPR
 #endif

-// C++0x features in 4.4.1 and later
-//
-#if (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__ < 40401) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
-// scoped enums have a serious bug in 4.4.0, so define BOOST_NO_SCOPED_ENUMS before 4.4.1
-// See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38064
-#  define BOOST_NO_SCOPED_ENUMS
-#endif
-
-// C++0x features in 4.5.n and later
+// C++0x features in 4.5.0 and later
 //
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
 #  define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
@@ -208,11 +200,29 @@
 #  define BOOST_NO_UNICODE_LITERALS
 #endif

-// C++0x features in 4.5.n and later
+// C++0x features in 4.5.1 and later
+//
+#if (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__ < 40501) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
+// scoped enums have a serious bug in 4.4.0, so define BOOST_NO_SCOPED_ENUMS before 4.5.1
+// See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38064
+#  define BOOST_NO_SCOPED_ENUMS
+#endif
+
+// C++0x features in 4.6.n and later
 //
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
 #define BOOST_NO_CONSTEXPR
+#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_NULLPTR
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#endif
+
+// C++0x features not supported at all yet
+//
+#define BOOST_NO_DECLTYPE_N3276
+
+#ifndef BOOST_COMPILER
+#  define BOOST_COMPILER "GNU C++ version " __VERSION__
 #endif

 // ConceptGCC compiler:
@@ -220,15 +230,8 @@
 #ifdef __GXX_CONCEPTS__
 #  define BOOST_HAS_CONCEPTS
 #  define BOOST_COMPILER "ConceptGCC version " __VERSION__
-#else
-#  define BOOST_NO_CONCEPTS
 #endif

-#ifndef BOOST_COMPILER
-#  define BOOST_COMPILER "GNU C++ version " __VERSION__
-#endif
-
-//
 // versions check:
 // we don't know gcc prior to version 2.90:
 #if (__GNUC__ == 2) && (__GNUC_MINOR__ < 90)
--- a/include/boost/config/compiler/gcc_xml.hpp
+++ b/include/boost/config/compiler/gcc_xml.hpp
@@ -31,6 +31,7 @@
 #  define BOOST_NO_NULLPTR
 #  define BOOST_NO_TEMPLATE_ALIASES
 #  define BOOST_NO_DECLTYPE
+#  define BOOST_NO_DECLTYPE_N3276
 #  define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #  define BOOST_NO_RVALUE_REFERENCES
 #  define BOOST_NO_STATIC_ASSERT
@@ -50,6 +51,8 @@
 #  define BOOST_NO_LAMBDAS
 #  define BOOST_NO_RAW_LITERALS
 #  define BOOST_NO_UNICODE_LITERALS
+#  define BOOST_NO_NOEXCEPT
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX

 #define BOOST_COMPILER "GCC-XML C++ version " __GCCXML__

--- a/include/boost/config/compiler/hp_acc.hpp
+++ b/include/boost/config/compiler/hp_acc.hpp
@@ -96,9 +96,9 @@
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
@@ -106,6 +106,7 @@
 #define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #define BOOST_NO_INITIALIZER_LISTS
 #define BOOST_NO_LAMBDAS
+#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_NULLPTR
 #define BOOST_NO_RAW_LITERALS
 #define BOOST_NO_RVALUE_REFERENCES
--- a/include/boost/config/compiler/intel.hpp
+++ b/include/boost/config/compiler/intel.hpp
@@ -26,7 +26,19 @@
 #  define BOOST_INTEL_CXX_VERSION __ECC
 #endif

+// Flags determined by comparing output of 'icpc -dM -E' with and without '-std=c++0x'
+#if (!(defined(_WIN32) || defined(_WIN64)) && defined(__STDC_HOSTED__) && (__STDC_HOSTED__ && (BOOST_INTEL_CXX_VERSION <= 1200))) || defined(__GXX_EXPERIMENTAL_CPP0X__)
+#  define BOOST_INTEL_STDCXX0X
+#endif
+#if defined(_MSC_VER) && (_MSC_VER >= 1600)
+#  define BOOST_INTEL_STDCXX0X
+#endif
+
+#ifdef BOOST_INTEL_STDCXX0X
+#define BOOST_COMPILER "Intel C++ C++0x mode version " BOOST_STRINGIZE(BOOST_INTEL_CXX_VERSION)
+#else
 #define BOOST_COMPILER "Intel C++ version " BOOST_STRINGIZE(BOOST_INTEL_CXX_VERSION)
+#endif
 #define BOOST_INTEL BOOST_INTEL_CXX_VERSION

 #if defined(_WIN32) || defined(_WIN64)
@@ -99,7 +111,7 @@
 #     define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
 #  endif
 #endif
-#if (defined(__GNUC__) && (__GNUC__ < 4)) || defined(_WIN32) || (BOOST_INTEL_CXX_VERSION <= 1110)
+#if (defined(__GNUC__) && (__GNUC__ < 4)) || defined(_WIN32) || (BOOST_INTEL_CXX_VERSION <= 1200)
 // GCC or VC emulation:
 #define BOOST_NO_TWO_PHASE_NAME_LOOKUP
 #endif
@@ -109,6 +121,7 @@
 // in type_traits code among other things, getting this correct
 // for the Intel compiler is actually remarkably fragile and tricky:
 //
+#ifdef __cplusplus
 #if defined(BOOST_NO_INTRINSIC_WCHAR_T)
 #include <cwchar>
 template< typename T > struct assert_no_intrinsic_wchar_t;
@@ -122,8 +135,9 @@ template<> struct assert_intrinsic_wchar_t<wchar_t> {};
 // if you see an error here then define BOOST_NO_INTRINSIC_WCHAR_T on the command line:
 template<> struct assert_intrinsic_wchar_t<unsigned short> {};
 #endif
+#endif

-#if _MSC_VER+0 >= 1000
+#if defined(_MSC_VER) && (_MSC_VER+0 >= 1000)
 #  if _MSC_VER >= 1200
 #     define BOOST_HAS_MS_INT64
 #  endif
@@ -165,8 +179,9 @@ template<> struct assert_intrinsic_wchar_t<unsigned short> {};
 // intel-vc9-win-11.1 may leave a non-POD array uninitialized, in some 
 // cases when it should be value-initialized.
 // (Niels Dekker, LKEB, May 2010)
+// Apparently Intel 12.1 (compiler version number 9999 !!) has the same issue (compiler regression).
 #if defined(__INTEL_COMPILER)
-#  if __INTEL_COMPILER <= 1110
+#  if (__INTEL_COMPILER <= 1110) || (__INTEL_COMPILER == 9999)
 #    define BOOST_NO_COMPLETE_VALUE_INITIALIZATION
 #  endif
 #endif
@@ -179,10 +194,69 @@ template<> struct assert_intrinsic_wchar_t<unsigned short> {};
 #  define BOOST_SYMBOL_IMPORT
 #  define BOOST_SYMBOL_VISIBLE __attribute__((visibility("default")))
 #endif
+//
+// C++0x features
+//     - ICC added static_assert in 11.0 (first version with C++0x support)
+//
+#if defined(BOOST_INTEL_STDCXX0X)
+#  undef  BOOST_NO_STATIC_ASSERT
+//
+// These pass our test cases, but aren't officially supported according to:
+// http://software.intel.com/en-us/articles/c0x-features-supported-by-intel-c-compiler/
+//
+//#  undef  BOOST_NO_LAMBDAS
+//#  undef  BOOST_NO_DECLTYPE
+//#  undef  BOOST_NO_AUTO_DECLARATIONS
+//#  undef  BOOST_NO_AUTO_MULTIDECLARATIONS
+#endif
+
+#if defined(BOOST_INTEL_STDCXX0X) && (BOOST_INTEL_CXX_VERSION >= 1200)
+//#  undef  BOOST_NO_RVALUE_REFERENCES // Enabling this breaks Filesystem and Exception libraries
+//#  undef  BOOST_NO_SCOPED_ENUMS  // doesn't really work!!
+#  undef  BOOST_NO_DELETED_FUNCTIONS
+#  undef  BOOST_NO_DEFAULTED_FUNCTIONS
+#  undef  BOOST_NO_LAMBDAS
+#  undef  BOOST_NO_DECLTYPE
+#  undef  BOOST_NO_AUTO_DECLARATIONS
+#  undef  BOOST_NO_AUTO_MULTIDECLARATIONS
+#endif
+
+// icl Version 12.1.0.233 Build 20110811 and possibly some other builds
+// had an incorrect __INTEL_COMPILER value of 9999. Intel say this has been fixed. 
+#if defined(BOOST_INTEL_STDCXX0X) && (BOOST_INTEL_CXX_VERSION > 1200)
+#  undef  BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#  undef  BOOST_NO_NULLPTR
+#  undef  BOOST_NO_RVALUE_REFERENCES
+#  undef  BOOST_NO_SFINAE_EXPR
+#  undef  BOOST_NO_TEMPLATE_ALIASES
+#  undef  BOOST_NO_VARIADIC_TEMPLATES
+
+// http://software.intel.com/en-us/articles/c0x-features-supported-by-intel-c-compiler/
+// continues to list scoped enum support as "Partial" 
+//#  undef  BOOST_NO_SCOPED_ENUMS 
+#endif
+
+#if defined(_MSC_VER) && (_MSC_VER <= 1700)
+//
+// Although the Intel compiler is capable of supporting these, it appears not to in MSVC compatibility mode:
+//
+#  define  BOOST_NO_INITIALIZER_LISTS
+#  define  BOOST_NO_VARIADIC_TEMPLATES
+#  define  BOOST_NO_DELETED_FUNCTIONS
+#  define  BOOST_NO_DEFAULTED_FUNCTIONS
+#  define  BOOST_NO_TEMPLATE_ALIASES
+#endif
+
+#if (BOOST_INTEL_CXX_VERSION < 1200)
+//
+// fenv.h appears not to work with Intel prior to 12.0:
+//
+#  define BOOST_NO_FENV_H
+#endif

 //
 // last known and checked version:
-#if (BOOST_INTEL_CXX_VERSION > 1110)
+#if (BOOST_INTEL_CXX_VERSION > 1200)
 #  if defined(BOOST_ASSERT_CONFIG)
 #     error "Unknown compiler version - please run the configure tests and report the results"
 #  elif defined(_MSC_VER)
--- a/include/boost/config/compiler/metrowerks.hpp
+++ b/include/boost/config/compiler/metrowerks.hpp
@@ -12,8 +12,6 @@

 //  Metrowerks C++ compiler setup:

-#define BOOST_MWERKS __MWERKS__
-
 // locale support is disabled when linking with the dynamic runtime
 #   ifdef _MSL_NO_LOCALE
 #     define BOOST_NO_STD_LOCALE
@@ -98,9 +96,9 @@
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
@@ -108,6 +106,7 @@
 #define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #define BOOST_NO_INITIALIZER_LISTS
 #define BOOST_NO_LAMBDAS
+#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_NULLPTR
 #define BOOST_NO_RAW_LITERALS
 #define BOOST_NO_SCOPED_ENUMS
@@ -117,6 +116,7 @@
 #define BOOST_NO_UNICODE_LITERALS
 #define BOOST_NO_VARIADIC_TEMPLATES
 #define BOOST_NO_VARIADIC_MACROS
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX

 #define BOOST_COMPILER "Metrowerks CodeWarrior C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)

--- a/include/boost/config/compiler/mpw.hpp
+++ b/include/boost/config/compiler/mpw.hpp
@@ -44,9 +44,9 @@
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
@@ -54,6 +54,7 @@
 #define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #define BOOST_NO_INITIALIZER_LISTS
 #define BOOST_NO_LAMBDAS
+#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_NULLPTR
 #define BOOST_NO_RAW_LITERALS
 #define BOOST_NO_RVALUE_REFERENCES
@@ -64,6 +65,7 @@
 #define BOOST_NO_UNICODE_LITERALS
 #define BOOST_NO_VARIADIC_TEMPLATES
 #define BOOST_NO_VARIADIC_MACROS
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX

 //
 // versions check:
--- a/include/boost/config/compiler/nvcc.hpp
+++ b/include/boost/config/compiler/nvcc.hpp
@@ -17,71 +17,12 @@

 // Boost support macro for NVCC 
 // NVCC Basically behaves like some flavor of MSVC6 + some specific quirks
-#define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
-#define BOOST_MSVC6_MEMBER_TEMPLATES
-#define BOOST_HAS_UNISTD_H
-#define BOOST_HAS_STDINT_H
-#define BOOST_HAS_SIGACTION
-#define BOOST_HAS_SCHED_YIELD
-#define BOOST_HAS_PTHREADS
-#define BOOST_HAS_PTHREAD_YIELD
-#define BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
-#define BOOST_HAS_PARTIAL_STD_ALLOCATOR
-#define BOOST_HAS_NRVO
-#define BOOST_HAS_NL_TYPES_H
-#define BOOST_HAS_NANOSLEEP
-#define BOOST_HAS_LONG_LONG
-#define BOOST_HAS_LOG1P
-#define BOOST_HAS_GETTIMEOFDAY
-#define BOOST_HAS_EXPM1
-#define BOOST_HAS_DIRENT_H
-#define BOOST_HAS_CLOCK_GETTIME
-#define BOOST_NO_VARIADIC_TEMPLATES
-#define BOOST_NO_VARIADIC_MACROS
-#define BOOST_NO_UNICODE_LITERALS
-#define BOOST_NO_TEMPLATE_ALIASES
-#define BOOST_NO_STD_UNORDERED
-#define BOOST_NO_STATIC_ASSERT
-#define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_SCOPED_ENUMS
-#define BOOST_NO_RVALUE_REFERENCES
-#define BOOST_NO_RAW_LITERALS
-#define BOOST_NO_NULLPTR
-#define BOOST_NO_LAMBDAS
-#define BOOST_NO_INITIALIZER_LISTS
-#define BOOST_NO_MS_INT64_NUMERIC_LIMITS
-#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_EXTERN_TEMPLATE
-#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_DELETED_FUNCTIONS
-#define BOOST_NO_DEFAULTED_FUNCTIONS
-#define BOOST_NO_DECLTYPE
-#define BOOST_NO_CONSTEXPR
-#define BOOST_NO_CONCEPTS
-#define BOOST_NO_CHAR32_T
-#define BOOST_NO_CHAR16_T
-#define BOOST_NO_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_AUTO_DECLARATIONS
-#define BOOST_NO_0X_HDR_UNORDERED_SET
-#define BOOST_NO_0X_HDR_UNORDERED_MAP
-#define BOOST_NO_0X_HDR_TYPE_TRAITS
-#define BOOST_NO_0X_HDR_TUPLE
-#define BOOST_NO_0X_HDR_THREAD
-#define BOOST_NO_0X_HDR_TYPEINDEX
-#define BOOST_NO_0X_HDR_SYSTEM_ERROR
-#define BOOST_NO_0X_HDR_REGEX
-#define BOOST_NO_0X_HDR_RATIO
-#define BOOST_NO_0X_HDR_RANDOM
-#define BOOST_NO_0X_HDR_MUTEX
-#define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
-#define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
-#define BOOST_NO_0X_HDR_INITIALIZER_LIST
-#define BOOST_NO_0X_HDR_FUTURE
-#define BOOST_NO_0X_HDR_FORWARD_LIST
-#define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
-#define BOOST_NO_0X_HDR_CONDITION_VARIABLE
-#define BOOST_NO_0X_HDR_CONCEPTS
-#define BOOST_NO_0X_HDR_CODECVT
-#define BOOST_NO_0X_HDR_CHRONO
-#define BOOST_NO_0X_HDR_ARRAY
+#ifdef __GNUC__

+#include <boost/config/compiler/gcc.hpp>
+
+#elif defined(_MSC_VER)
+
+#include <boost/config/compiler/visualc.hpp>
+
+#endif
--- a/include/boost/config/compiler/pathscale.hpp
+++ b/include/boost/config/compiler/pathscale.hpp
@@ -43,6 +43,7 @@
 #  define BOOST_NO_RAW_LITERALS
 #  define BOOST_NO_NULLPTR
 #  define BOOST_NO_NUMERIC_LIMITS_LOWEST
+#  define BOOST_NO_NOEXCEPT
 #  define BOOST_NO_LAMBDAS
 #  define BOOST_NO_INITIALIZER_LISTS
 #  define BOOST_NO_MS_INT64_NUMERIC_LIMITS
@@ -51,13 +52,14 @@
 #  define BOOST_NO_DELETED_FUNCTIONS
 #  define BOOST_NO_DEFAULTED_FUNCTIONS
 #  define BOOST_NO_DECLTYPE
+#  define BOOST_NO_DECLTYPE_N3276
 #  define BOOST_NO_CONSTEXPR
-#  define BOOST_NO_CONCEPTS
 #  define BOOST_NO_COMPLETE_VALUE_INITIALIZATION
 #  define BOOST_NO_CHAR32_T
 #  define BOOST_NO_CHAR16_T
 #  define BOOST_NO_AUTO_MULTIDECLARATIONS
 #  define BOOST_NO_AUTO_DECLARATIONS
+#  define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
 #  define BOOST_NO_0X_HDR_UNORDERED_SET
 #  define BOOST_NO_0X_HDR_UNORDERED_MAP
 #  define BOOST_NO_0X_HDR_TYPEINDEX
@@ -68,14 +70,10 @@
 #  define BOOST_NO_0X_HDR_RATIO
 #  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_MUTEX
-#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
-#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
 #  define BOOST_NO_0X_HDR_INITIALIZER_LIST
 #  define BOOST_NO_0X_HDR_FUTURE
 #  define BOOST_NO_0X_HDR_FORWARD_LIST
-#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
 #  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_0X_HDR_CONCEPTS
 #  define BOOST_NO_0X_HDR_CODECVT
 #  define BOOST_NO_0X_HDR_CHRONO
 #endif
--- a/include/boost/config/compiler/pgi.hpp
+++ b/include/boost/config/compiler/pgi.hpp
@@ -8,7 +8,7 @@
 //  PGI C++ compiler setup:

 #define BOOST_COMPILER_VERSION __PGIC__##__PGIC_MINOR__
-#define BOOST_COMPILER "PGI compiler version " BOOST_STRINGIZE(_COMPILER_VERSION)
+#define BOOST_COMPILER "PGI compiler version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)

 //
 // Threading support:
@@ -16,9 +16,6 @@
 // if no threading API is detected.
 //

-// PGI 10.x doesn't seem to define __PGIC__
-
-// versions earlier than 10.x do define __PGIC__
 #if __PGIC__ >= 10

 // options requested by configure --enable-test
@@ -51,9 +48,9 @@
 //
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
@@ -61,6 +58,7 @@
 #define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #define BOOST_NO_INITIALIZER_LISTS
 #define BOOST_NO_LAMBDAS
+#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_NULLPTR
 #define BOOST_NO_RAW_LITERALS
 #define BOOST_NO_RVALUE_REFERENCES
@@ -71,6 +69,7 @@
 #define BOOST_NO_UNICODE_LITERALS
 #define BOOST_NO_VARIADIC_TEMPLATES
 #define BOOST_NO_VARIADIC_MACROS
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX

 //
 // version check:
--- a/include/boost/config/compiler/sunpro_cc.hpp
+++ b/include/boost/config/compiler/sunpro_cc.hpp
@@ -11,10 +11,6 @@

 //  Sun C++ compiler setup:

-// Macro identifying the Sun compiler
-
-#define BOOST_SUNCC __SUNPRO_CC
-
 #    if __SUNPRO_CC <= 0x500
 #      define BOOST_NO_MEMBER_TEMPLATES
 #      define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
@@ -107,9 +103,9 @@
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
@@ -117,6 +113,7 @@
 #define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #define BOOST_NO_INITIALIZER_LISTS
 #define BOOST_NO_LAMBDAS
+#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_NULLPTR
 #define BOOST_NO_RAW_LITERALS
 #define BOOST_NO_RVALUE_REFERENCES
@@ -127,6 +124,7 @@
 #define BOOST_NO_UNICODE_LITERALS
 #define BOOST_NO_VARIADIC_TEMPLATES
 #define BOOST_NO_VARIADIC_MACROS
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX

 //
 // Version
--- a/include/boost/config/compiler/vacpp.hpp
+++ b/include/boost/config/compiler/vacpp.hpp
@@ -27,7 +27,6 @@

 #if (__IBMCPP__ <= 600) || !defined(BOOST_STRICT_CONFIG)
 #  define BOOST_NO_POINTER_TO_MEMBER_TEMPLATE_PARAMETERS
-#  define BOOST_NO_INITIALIZER_LISTS
 #endif

 #if (__IBMCPP__ <= 1110)
@@ -54,44 +53,68 @@
 #error "Compiler not supported or configured - please reconfigure"
 #endif
 //
-// last known and checked version is 600:
-#if (__IBMCPP__ > 1010)
+// last known and checked version is 1110:
+#if (__IBMCPP__ > 1110)
 #  if defined(BOOST_ASSERT_CONFIG)
 #     error "Unknown compiler version - please run the configure tests and report the results"
 #  endif
 #endif

 // Some versions of the compiler have issues with default arguments on partial specializations
+#if __IBMCPP__ <= 1010
 #define BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS
+#endif

 //
 // C++0x features
 //
 //   See boost\config\suffix.hpp for BOOST_NO_LONG_LONG
 //
-#define BOOST_NO_AUTO_DECLARATIONS
-#define BOOST_NO_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CHAR16_T
-#define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONCEPTS
+#if ! __IBMCPP_AUTO_TYPEDEDUCTION
+#  define BOOST_NO_AUTO_DECLARATIONS
+#  define BOOST_NO_AUTO_MULTIDECLARATIONS
+#endif
+#if ! __IBMCPP_UTF_LITERAL__
+#  define BOOST_NO_CHAR16_T
+#  define BOOST_NO_CHAR32_T
+#endif
 #define BOOST_NO_CONSTEXPR
-#define BOOST_NO_DECLTYPE
+#if ! __IBMCPP_DECLTYPE
+#  define BOOST_NO_DECLTYPE
+#else
+#  define BOOST_HAS_DECLTYPE
+#endif
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_EXTERN_TEMPLATE
-#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#if ! __IBMCPP_EXTERN_TEMPLATE
+#  define BOOST_NO_EXTERN_TEMPLATE
+#endif
+#if ! __IBMCPP_VARIADIC_TEMPLATES
+// not enabled separately at this time
+#  define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#endif
+#define BOOST_NO_INITIALIZER_LISTS
 #define BOOST_NO_LAMBDAS
+#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_NULLPTR
 #define BOOST_NO_RAW_LITERALS
 #define BOOST_NO_RVALUE_REFERENCES
 #define BOOST_NO_SCOPED_ENUMS
 #define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_STATIC_ASSERT
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#if ! __IBMCPP_STATIC_ASSERT
+#  define BOOST_NO_STATIC_ASSERT
+#endif
 #define BOOST_NO_TEMPLATE_ALIASES
 #define BOOST_NO_UNICODE_LITERALS
-#define BOOST_NO_VARIADIC_TEMPLATES
-#define BOOST_NO_VARIADIC_MACROS
+#if ! __IBMCPP_VARIADIC_TEMPLATES
+#  define BOOST_NO_VARIADIC_TEMPLATES
+#endif
+#if ! __C99_MACRO_WITH_VA_ARGS
+#  define BOOST_NO_VARIADIC_MACROS
+#endif



--- a/include/boost/config/compiler/visualc.hpp
+++ b/include/boost/config/compiler/visualc.hpp
@@ -129,11 +129,15 @@
 #endif

 #if defined(_WIN32_WCE) || defined(UNDER_CE)
-#  define BOOST_NO_THREADEX
-#  define BOOST_NO_GETSYSTEMTIMEASFILETIME
 #  define BOOST_NO_SWPRINTF
 #endif

+// we have ThreadEx or GetSystemTimeAsFileTime unless we're running WindowsCE
+#if !defined(_WIN32_WCE) && !defined(UNDER_CE)
+#  define BOOST_HAS_THREADEX
+#  define BOOST_HAS_GETSYSTEMTIMEASFILETIME
+#endif
+
 //   
 // check for exception handling support:   
 #if !defined(_CPPUNWIND) && !defined(BOOST_NO_EXCEPTIONS)
@@ -179,6 +183,7 @@
 #define BOOST_NO_RVALUE_REFERENCES
 #define BOOST_NO_STATIC_ASSERT
 #define BOOST_NO_NULLPTR
+#define BOOST_NO_DECLTYPE
 #endif // _MSC_VER < 1600

 #if _MSC_VER >= 1600
@@ -188,14 +193,14 @@
 // C++0x features not supported by any versions
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
-#define BOOST_NO_DECLTYPE
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
 #define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #define BOOST_NO_INITIALIZER_LISTS
+#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_RAW_LITERALS
 #define BOOST_NO_SCOPED_ENUMS
 #define BOOST_NO_TEMPLATE_ALIASES
@@ -203,6 +208,7 @@
 #define BOOST_NO_VARIADIC_TEMPLATES
 #define BOOST_NO_SFINAE_EXPR
 #define BOOST_NO_TWO_PHASE_NAME_LOOKUP
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
 //
 // prefix and suffix headers:
 //
@@ -230,6 +236,8 @@
 #     define BOOST_COMPILER_VERSION evc9
 #   elif _MSC_VER == 1600
 #     define BOOST_COMPILER_VERSION evc10
+#   elif _MSC_VER == 1700 
+#     define BOOST_COMPILER_VERSION evc11 
 #   else
 #      if defined(BOOST_ASSERT_CONFIG)
 #         error "Unknown EVC++ compiler version - please run the configure tests and report the results"
@@ -253,6 +261,8 @@
 #     define BOOST_COMPILER_VERSION 9.0
 #   elif _MSC_VER == 1600
 #     define BOOST_COMPILER_VERSION 10.0
+#   elif _MSC_VER == 1700 
+#     define BOOST_COMPILER_VERSION 11.0 
 #   else
 #     define BOOST_COMPILER_VERSION _MSC_VER
 #   endif
@@ -267,8 +277,8 @@
 #error "Compiler not supported or configured - please reconfigure"
 #endif
 //
-// last known and checked version is 1600 (VC10, aka 2010):
-#if (_MSC_VER > 1600)
+// last known and checked version is 1700 (VC11, aka 2011):
+#if (_MSC_VER > 1700)
 #  if defined(BOOST_ASSERT_CONFIG)
 #     error "Unknown compiler version - please run the configure tests and report the results"
 #  else
--- a/include/boost/config/platform/aix.hpp
+++ b/include/boost/config/platform/aix.hpp
@@ -1,5 +1,4 @@
 //  (C) Copyright John Maddock 2001 - 2002. 
-// (C) Copyright Bryce Lelbach 2010
 //  Use, modification and distribution are subject to the 
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,13 +9,6 @@

 #define BOOST_PLATFORM "IBM Aix"

-#define BOOST_NIX            1 
-//#define BOOST_GENETIC_NIX    1
-#define BOOST_TRADEMARK_NIX  1
-//#define BOOST_FUNCTIONAL_NIX 1
-
-#define BOOST_AIX 1
-
 #define BOOST_HAS_UNISTD_H
 #define BOOST_HAS_NL_TYPES_H
 #define BOOST_HAS_NANOSLEEP
--- a/include/boost/config/platform/amigaos.hpp
+++ b/include/boost/config/platform/amigaos.hpp
@@ -1,5 +1,4 @@
 //  (C) Copyright John Maddock 2002. 
-// (C) Copyright Bryce Lelbach 2010
 //  Use, modification and distribution are subject to the 
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -8,8 +7,6 @@

 #define BOOST_PLATFORM "AmigaOS"

-#define BOOST_AMIGA 1
-
 #define BOOST_DISABLE_THREADS
 #define BOOST_NO_CWCHAR
 #define BOOST_NO_STD_WSTRING
--- a/include/boost/config/platform/beos.hpp
+++ b/include/boost/config/platform/beos.hpp
@@ -1,5 +1,4 @@
 //  (C) Copyright John Maddock 2001. 
-// (C) Copyright Bryce Lelbach 2010
 //  Use, modification and distribution are subject to the 
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,13 +9,6 @@

 #define BOOST_PLATFORM "BeOS"

-#define BOOST_BEOS 1
-
-#define BOOST_NIX            1 
-//#define BOOST_GENETIC_NIX    1
-//#define BOOST_TRADEMARK_NIX  1
-#define BOOST_FUNCTIONAL_NIX 1
-
 #define BOOST_NO_CWCHAR
 #define BOOST_NO_CWCTYPE
 #define BOOST_HAS_UNISTD_H
--- a/include/boost/config/platform/bsd.hpp
+++ b/include/boost/config/platform/bsd.hpp
@@ -1,7 +1,6 @@
 //  (C) Copyright John Maddock 2001 - 2003. 
 //  (C) Copyright Darin Adler 2001. 
 //  (C) Copyright Douglas Gregor 2002. 
-// (C) Copyright Bryce Lelbach 2010
 //  Use, modification and distribution are subject to the 
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,30 +9,18 @@

 //  generic BSD config options:

-#if !defined(__FreeBSD__)   && \
-    !defined(__NetBSD__)    && \
-    !defined(__OpenBSD__)   && \
-    !defined(__DragonFly__)
-  #error "This platform is not BSD"
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
+#error "This platform is not BSD"
 #endif

-#define BOOST_NIX            1 
-#define BOOST_GENETIC_NIX    1
-//#define BOOST_TRADEMARK_NIX  1
-//#define BOOST_FUNCTIONAL_NIX 1
-
 #ifdef __FreeBSD__
-  #define BOOST_PLATFORM "FreeBSD " BOOST_STRINGIZE(__FreeBSD__)
-  #define BOOST_FREEBSD __FreeBSD__
+#define BOOST_PLATFORM "FreeBSD " BOOST_STRINGIZE(__FreeBSD__)
 #elif defined(__NetBSD__)
-  #define BOOST_PLATFORM "NetBSD " BOOST_STRINGIZE(__NetBSD__)
-  #define BOOST_NETBSD __NetBSD__
+#define BOOST_PLATFORM "NetBSD " BOOST_STRINGIZE(__NetBSD__)
 #elif defined(__OpenBSD__)
-  #define BOOST_PLATFORM "OpenBSD " BOOST_STRINGIZE(__OpenBSD__)
-  #define BOOST_OPENBSD __OpenBSD__
+#define BOOST_PLATFORM "OpenBSD " BOOST_STRINGIZE(__OpenBSD__)
 #elif defined(__DragonFly__)
-  #define BOOST_PLATFORM "DragonFly " BOOST_STRINGIZE(__DragonFly__)
-  #define BOOST_DFBSD __DragonFly__
+#define BOOST_PLATFORM "DragonFly " BOOST_STRINGIZE(__DragonFly__)
 #endif

 //
--- a/include/boost/config/platform/cray.hpp
+++ b/include/boost/config/platform/cray.hpp
@@ -0,0 +1,18 @@
+//  (C) Copyright John Maddock 2011.
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+
+//  See http://www.boost.org for most recent version.
+
+//  SGI Irix specific config options:
+
+#define BOOST_PLATFORM "Cray"
+
+// boilerplate code:
+#define BOOST_HAS_UNISTD_H
+#include <boost/config/posix_features.hpp>
+
+
+
--- a/include/boost/config/platform/cygwin.hpp
+++ b/include/boost/config/platform/cygwin.hpp
@@ -1,56 +1,55 @@
-// (C) Copyright John Maddock 2001 - 2003
-// (C) Copyright Bryce Lelbach 2010
-//
-// Use, modification and distribution are subject to the 
-// Boost Software License, Version 1.0. (See accompanying file 
-// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-// See http://www.boost.org for most recent version.
+//  (C) Copyright John Maddock 2001 - 2003. 
+//  Use, modification and distribution are subject to the 
+//  Boost Software License, Version 1.0. (See accompanying file 
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#define BOOST_PLATFORM          "Cygwin"   // Platform name.
-#define BOOST_CYGWIN            __CYGWIN__ // Boost platform ID macros.
+//  See http://www.boost.org for most recent version.

+//  cygwin specific config options:
+
+#define BOOST_PLATFORM "Cygwin"
 #define BOOST_HAS_DIRENT_H
 #define BOOST_HAS_LOG1P
 #define BOOST_HAS_EXPM1

-#define BOOST_NIX            1 
-//#define BOOST_GENETIC_NIX    1
-//#define BOOST_TRADEMARK_NIX  1
-#define BOOST_FUNCTIONAL_NIX 1
-
-// See if we have POSIX threads, otherwise revert to native Win threads.
+//
+// Threading API:
+// See if we have POSIX threads, if we do use them, otherwise
+// revert to native Win threads.
 #define BOOST_HAS_UNISTD_H
 #include <unistd.h>
-
-#if defined(_POSIX_THREADS) && (_POSIX_THREADS + 0 >= 0) && \
-    !defined(BOOST_HAS_WINTHREADS)
-  #define BOOST_HAS_PTHREADS
-  #define BOOST_HAS_SCHED_YIELD
-  #define BOOST_HAS_GETTIMEOFDAY
-  #define BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
-  #define BOOST_HAS_SIGACTION
+#if defined(_POSIX_THREADS) && (_POSIX_THREADS+0 >= 0) && !defined(BOOST_HAS_WINTHREADS)
+#  define BOOST_HAS_PTHREADS
+#  define BOOST_HAS_SCHED_YIELD
+#  define BOOST_HAS_GETTIMEOFDAY
+#  define BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
+#  define BOOST_HAS_SIGACTION
 #else
-  #if !defined(BOOST_HAS_WINTHREADS)
-    #define BOOST_HAS_WINTHREADS
-  #endif
-  #define BOOST_HAS_FTIME
+#  if !defined(BOOST_HAS_WINTHREADS)
+#     define BOOST_HAS_WINTHREADS
+#  endif
+#  define BOOST_HAS_FTIME
 #endif

-// Find out if we have a stdint.h, there should be a better way to do this.
+//
+// find out if we have a stdint.h, there should be a better way to do this:
+//
 #include <sys/types.h>
-
 #ifdef _STDINT_H
-  #define BOOST_HAS_STDINT_H
+#define BOOST_HAS_STDINT_H
 #endif

 /// Cygwin has no fenv.h
 #define BOOST_NO_FENV_H

+// boilerplate code:
 #include <boost/config/posix_features.hpp>

-// Cygwin lies about XSI conformance, there is no nl_types.h.
+//
+// Cygwin lies about XSI conformance, there is no nl_types.h:
+//
 #ifdef BOOST_HAS_NL_TYPES_H
-  #undef BOOST_HAS_NL_TYPES_H
+#  undef BOOST_HAS_NL_TYPES_H
 #endif
 

--- a/include/boost/config/platform/hpux.hpp
+++ b/include/boost/config/platform/hpux.hpp
@@ -3,7 +3,6 @@
 //  (C) Copyright David Abrahams 2002. 
 //  (C) Copyright Toon Knapen 2003. 
 //  (C) Copyright Boris Gubenko 2006 - 2007.
-// (C) Copyright Bryce Lelbach 2010
 //  Use, modification and distribution are subject to the 
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -14,13 +13,6 @@

 #define BOOST_PLATFORM "HP-UX"

-#define BOOST_HPUX 1 // platform ID macro
-
-#define BOOST_NIX            1 
-//#define BOOST_GENETIC_NIX    1
-#define BOOST_TRADEMARK_NIX  1
-//#define BOOST_FUNCTIONAL_NIX 1
-
 // In principle, HP-UX has a nice <stdint.h> under the name <inttypes.h>
 // However, it has the following problem:
 // Use of UINT32_C(0) results in "0u l" for the preprocessed source
--- a/include/boost/config/platform/irix.hpp
+++ b/include/boost/config/platform/irix.hpp
@@ -1,6 +1,5 @@
 //  (C) Copyright John Maddock 2001 - 2003. 
 //  (C) Copyright Jens Maurer 2003. 
-// (C) Copyright Bryce Lelbach 2010
 //  Use, modification and distribution are subject to the 
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -12,11 +11,6 @@

 #define BOOST_PLATFORM "SGI Irix"

-#define BOOST_NIX            1 
-//#define BOOST_GENETIC_NIX    1
-#define BOOST_TRADEMARK_NIX  1
-//#define BOOST_FUNCTIONAL_NIX 1
-
 #define BOOST_NO_SWPRINTF 
 //
 // these are not auto detected by POSIX feature tests:
--- a/include/boost/config/platform/linux.hpp
+++ b/include/boost/config/platform/linux.hpp
@@ -1,6 +1,5 @@
 //  (C) Copyright John Maddock 2001 - 2003. 
 //  (C) Copyright Jens Maurer 2001 - 2003. 
-// (C) Copyright Bryce Lelbach 2010
 //  Use, modification and distribution are subject to the 
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -12,14 +11,11 @@
 #define BOOST_PLATFORM "linux"

 // make sure we have __GLIBC_PREREQ if available at all
+#ifdef __cplusplus
 #include <cstdlib>
-
-#define BOOST_NIX            1 
-//#define BOOST_GENETIC_NIX    1
-//#define BOOST_TRADEMARK_NIX  1
-#define BOOST_FUNCTIONAL_NIX 1
-
-#define BOOST_LINUX 1
+#else
+#include <stdlib.h>
+#endif

 //
 // <stdint.h> added to glibc 2.1.1
@@ -76,6 +72,7 @@
 // boilerplate code:
 #define BOOST_HAS_UNISTD_H
 #include <boost/config/posix_features.hpp>
+#define BOOST_HAS_PTHREAD_YIELD

 #ifndef __GNUC__
 //
--- a/include/boost/config/platform/macos.hpp
+++ b/include/boost/config/platform/macos.hpp
@@ -1,7 +1,6 @@
 //  (C) Copyright John Maddock 2001 - 2003. 
 //  (C) Copyright Darin Adler 2001 - 2002. 
 //  (C) Copyright Bill Kempf 2002. 
-// (C) Copyright Bryce Lelbach 2010
 //  Use, modification and distribution are subject to the 
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -14,11 +13,6 @@

 #if __MACH__ && !defined(_MSL_USING_MSL_C)

-#define BOOST_NIX            1 
-//#define BOOST_GENETIC_NIX    1
-#define BOOST_TRADEMARK_NIX  1
-//#define BOOST_FUNCTIONAL_NIX 1
-
 // Using the Mac OS X system BSD-style C library.

 #  ifndef BOOST_HAS_UNISTD_H
@@ -70,16 +64,17 @@
 #  if ( defined(TARGET_API_MAC_CARBON) && TARGET_API_MAC_CARBON ) || ( defined(TARGET_CARBON) && TARGET_CARBON )

 #  if !defined(BOOST_HAS_PTHREADS)
-#    define BOOST_HAS_MPTASKS
+// MPTasks support is deprecated/removed from Boost:
+//#    define BOOST_HAS_MPTASKS
 #  elif ( __dest_os == __mac_os_x )
 // We are doing a Carbon/Mach-O/MSL build which has pthreads, but only the
 // gettimeofday and no posix.
 #  define BOOST_HAS_GETTIMEOFDAY
 #  endif

-// The MP task implementation of Boost Threads aims to replace MP-unsafe
-// parts of the MSL, so we turn on threads unconditionally.
-#    define BOOST_HAS_THREADS
+#ifdef BOOST_HAS_PTHREADS
+#  define BOOST_HAS_THREADS
+#endif

 // The remote call manager depends on this.
 #    define BOOST_BIND_ENABLE_PASCAL
--- a/include/boost/config/platform/qnxnto.hpp
+++ b/include/boost/config/platform/qnxnto.hpp
@@ -1,5 +1,4 @@
 //  (C) Copyright Jim Douglas 2005. 
-// (C) Copyright Bryce Lelbach 2010
 //  Use, modification and distribution are subject to the 
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -8,15 +7,8 @@

 //  QNX specific config options:

-#define BOOST_QNX 1
-
 #define BOOST_PLATFORM "QNX"

-#define BOOST_NIX            1 
-//#define BOOST_GENETIC_NIX    1
-//#define BOOST_TRADEMARK_NIX  1
-#define BOOST_FUNCTIONAL_NIX 1
-
 #define BOOST_HAS_UNISTD_H
 #include <boost/config/posix_features.hpp>

--- a/include/boost/config/platform/solaris.hpp
+++ b/include/boost/config/platform/solaris.hpp
@@ -1,6 +1,5 @@
 //  (C) Copyright John Maddock 2001 - 2003. 
 //  (C) Copyright Jens Maurer 2003. 
-// (C) Copyright Bryce Lelbach 2010
 //  Use, modification and distribution are subject to the 
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -11,11 +10,6 @@

 #define BOOST_PLATFORM "Sun Solaris"

-#define BOOST_NIX            1 
-//#define BOOST_GENETIC_NIX    1
-#define BOOST_TRADEMARK_NIX  1
-//#define BOOST_FUNCTIONAL_NIX 1
-
 #define BOOST_HAS_GETTIMEOFDAY

 // boilerplate code:
--- a/include/boost/config/platform/symbian.hpp
+++ b/include/boost/config/platform/symbian.hpp
@@ -1,7 +1,6 @@
 //  (C) Copyright Yuriy Krasnoschek 2009. 
 //  (C) Copyright John Maddock 2001 - 2003. 
 //  (C) Copyright Jens Maurer 2001 - 2003. 
-// (C) Copyright Bryce Lelbach 2010
 //  Use, modification and distribution are subject to the 
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,20 +9,20 @@

 //  symbian specific config options:

+
 #define BOOST_PLATFORM "Symbian"
 #define BOOST_SYMBIAN 1

+
 #if defined(__S60_3X__)
-// Open C / C++ plugin was introdused in this SDK, earlier versions don't have
-// CRT / STL
-#  define BOOST_NIX            1 
-//#  define BOOST_GENETIC_NIX    1
-//#  define BOOST_TRADEMARK_NIX  1
-#  define BOOST_FUNCTIONAL_NIX 1
+// Open C / C++ plugin was introdused in this SDK, earlier versions don't have CRT / STL
 #  define BOOST_S60_3rd_EDITION_FP2_OR_LATER_SDK
 // make sure we have __GLIBC_PREREQ if available at all
-#  include <cstdlib>
-// boilerplate code:
+#ifdef __cplusplus
+#include <cstdlib>
+#else
+#include <stdlib.h>
+#endif// boilerplate code:
 #  define BOOST_HAS_UNISTD_H
 #  include <boost/config/posix_features.hpp>
 // S60 SDK defines _POSIX_VERSION as POSIX.1
--- a/include/boost/config/platform/vxworks.hpp
+++ b/include/boost/config/platform/vxworks.hpp
@@ -1,5 +1,4 @@
 //  (C) Copyright Dustin Spicuzza 2009. 
-// (C) Copyright Bryce Lelbach 2010
 //  Use, modification and distribution are subject to the 
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -24,11 +23,6 @@
 #define _POSIX_TIMERS 1
 #define _POSIX_THREADS 1

-#define BOOST_NIX            1 
-//#define BOOST_GENETIC_NIX    1
-#define BOOST_TRADEMARK_NIX  1
-//#define BOOST_FUNCTIONAL_NIX 1
-
 // vxworks doesn't work with asio serial ports
 #define BOOST_ASIO_DISABLE_SERIAL_PORT

--- a/include/boost/config/platform/win32.hpp
+++ b/include/boost/config/platform/win32.hpp
@@ -55,6 +55,8 @@

 #ifdef _WIN32_WCE
 #  define BOOST_NO_ANSI_APIS
+#else
+#  define BOOST_HAS_GETSYSTEMTIMEASFILETIME
 #endif

 #ifndef BOOST_HAS_PTHREADS
--- a/include/boost/config/select_compiler_config.hpp
+++ b/include/boost/config/select_compiler_config.hpp
@@ -10,33 +10,6 @@

 //  See http://www.boost.org/ for most recent version.

-
-// one identification macro for each of the
-// compilers we support:
-
-#   define BOOST_CXX_GCCXML     0
-#   define BOOST_CXX_NVCC       0
-#   define BOOST_CXX_COMO       0
-#   define BOOST_CXX_PATHSCALE  0
-#   define BOOST_CXX_CLANG      0
-#   define BOOST_CXX_DMC        0
-#   define BOOST_CXX_INTEL      0
-#   define BOOST_CXX_GNUC       0
-#   define BOOST_CXX_KCC        0
-#   define BOOST_CXX_SGI        0
-#   define BOOST_CXX_TRU64      0
-#   define BOOST_CXX_GHS        0
-#   define BOOST_CXX_BORLAND    0
-#   define BOOST_CXX_CW         0
-#   define BOOST_CXX_SUNPRO     0
-#   define BOOST_CXX_HPACC      0
-#   define BOOST_CXX_MPW        0
-#   define BOOST_CXX_IBMCPP     0
-#   define BOOST_CXX_MSVC       0
-#   define BOOST_CXX_PGI        0
-#   define BOOST_CXX_NVCC       0
-
-
 // locate which compiler we are using and define
 // BOOST_COMPILER_CONFIG as needed: 

@@ -44,6 +17,10 @@
 // GCC-XML emulates other compilers, it has to appear first here!
 #   define BOOST_COMPILER_CONFIG "boost/config/compiler/gcc_xml.hpp"

+#elif defined(_CRAYC)
+// EDG based Cray compiler:
+#   define BOOST_COMPILER_CONFIG "boost/config/compiler/cray.hpp"
+
 #elif defined __CUDACC__
 //  NVIDIA CUDA C++ compiler for GPU
 #   define BOOST_COMPILER_CONFIG "boost/config/compiler/nvcc.hpp"
--- a/include/boost/config/select_platform_config.hpp
+++ b/include/boost/config/select_platform_config.hpp
@@ -13,7 +13,7 @@
 // <header_name> in order to prevent macro expansion within the header
 // name (for example "linux" is a macro on linux systems).

-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) 
+#if (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) && !defined(_CRAYC)
 // linux, also other platforms (Hurd etc) that use GLIBC, should these really have their own config headers though?
 #  define BOOST_PLATFORM_CONFIG "boost/config/platform/linux.hpp"

@@ -69,6 +69,10 @@
 // Symbian: 
 #  define BOOST_PLATFORM_CONFIG "boost/config/platform/symbian.hpp" 

+#elif defined(_CRAYC)
+// Cray:
+#  define BOOST_PLATFORM_CONFIG "boost/config/platform/cray.hpp" 
+
 #elif defined(__VMS) 
 // VMS:
 #  define BOOST_PLATFORM_CONFIG "boost/config/platform/vms.hpp" 
--- a/include/boost/config/select_stdlib_config.hpp
+++ b/include/boost/config/select_stdlib_config.hpp
@@ -14,7 +14,11 @@
 // First include <cstddef> to determine if some version of STLport is in use as the std lib
 // (do not rely on this header being included since users can short-circuit this header 
 //  if they know whose std lib they are using.)
-#include <cstddef>
+#ifdef __cplusplus
+#  include <cstddef>
+#else
+#  include <stddef.h>
+#endif

 #if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
 // STLPort library; this _must_ come first, otherwise since
@@ -40,6 +44,10 @@
 // Rogue Wave library:
 #  define BOOST_STDLIB_CONFIG "boost/config/stdlib/roguewave.hpp"

+#elif defined(_LIBCPP_VERSION)
+// libc++
+#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/libcpp.hpp"
+
 #elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
 // GNU libstdc++ 3
 #  define BOOST_STDLIB_CONFIG "boost/config/stdlib/libstdcpp3.hpp"
--- a/include/boost/config/stdlib/dinkumware.hpp
+++ b/include/boost/config/stdlib/dinkumware.hpp
@@ -87,7 +87,7 @@
 #endif

 #include <typeinfo>
-#if !_HAS_EXCEPTIONS
+#if ( (!_HAS_EXCEPTIONS && !defined(__ghs__)) || (!_HAS_NAMESPACE && defined(__ghs__)) ) 
 #  define BOOST_NO_STD_TYPEINFO    
 #endif  

@@ -101,7 +101,6 @@
 #  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_REGEX
 #  define BOOST_NO_0X_HDR_SYSTEM_ERROR
-#  define BOOST_NO_0X_HDR_TYPE_TRAITS
 #  define BOOST_NO_STD_UNORDERED        // deprecated; see following
 #  define BOOST_NO_0X_HDR_UNORDERED_MAP
 #  define BOOST_NO_0X_HDR_UNORDERED_SET
@@ -110,19 +109,16 @@
 #  define BOOST_NO_NUMERIC_LIMITS_LOWEST
 #endif

-#if !defined(_HAS_TR1_IMPORTS) && !defined(BOOST_NO_0X_HDR_TUPLE)
+#if (!defined(_HAS_TR1_IMPORTS) || (_HAS_TR1_IMPORTS+0 == 0)) && !defined(BOOST_NO_0X_HDR_TUPLE)
 #  define BOOST_NO_0X_HDR_TUPLE
 #endif
-
-//  C++0x headers not yet implemented
 //
+//  C++0x headers not yet (fully) implemented:
+//
+#  define BOOST_NO_0X_HDR_TYPE_TRAITS
 #  define BOOST_NO_0X_HDR_CHRONO
-#  define BOOST_NO_0X_HDR_CONCEPTS
 #  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
 #  define BOOST_NO_0X_HDR_FUTURE
-#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
-#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
 #  define BOOST_NO_0X_HDR_MUTEX
 #  define BOOST_NO_0X_HDR_RATIO
 #  define BOOST_NO_0X_HDR_THREAD
--- a/include/boost/config/stdlib/libcomo.hpp
+++ b/include/boost/config/stdlib/libcomo.hpp
@@ -38,14 +38,10 @@
 #  define BOOST_NO_0X_HDR_ARRAY
 #  define BOOST_NO_0X_HDR_CHRONO
 #  define BOOST_NO_0X_HDR_CODECVT
-#  define BOOST_NO_0X_HDR_CONCEPTS
 #  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
 #  define BOOST_NO_0X_HDR_FORWARD_LIST
 #  define BOOST_NO_0X_HDR_FUTURE
 #  define BOOST_NO_0X_HDR_INITIALIZER_LIST
-#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
-#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
 #  define BOOST_NO_0X_HDR_MUTEX
 #  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_RATIO
--- a/include/boost/config/stdlib/libcpp.hpp
+++ b/include/boost/config/stdlib/libcpp.hpp
@@ -0,0 +1,36 @@
+//  (C) Copyright Christopher Jefferson 2011.
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for most recent version.
+
+//  config for libc++
+//  Might need more in here later.
+
+#if !defined(_LIBCPP_VERSION)
+#  include <ciso646>
+#  if !defined(_LIBCPP_VERSION)
+#      error "This is not libc++!"
+#  endif
+#endif
+
+#define BOOST_STDLIB "libc++ version " BOOST_STRINGIZE(_LIBCPP_VERSION)
+
+#define BOOST_HAS_THREADS
+
+#ifdef _LIBCPP_HAS_NO_VARIADICS
+#    define BOOST_NO_0X_HDR_TUPLE
+#endif
+
+//
+// These appear to be unusable/incomplete so far:
+//
+#  define BOOST_NO_0X_HDR_CHRONO
+#  define BOOST_NO_0X_HDR_FUTURE
+#  define BOOST_NO_0X_HDR_TYPE_TRAITS
+
+// libc++ uses a non-standard messages_base
+#define BOOST_NO_STD_MESSAGES
+
+//  --- end ---
--- a/include/boost/config/stdlib/libstdcpp3.hpp
+++ b/include/boost/config/stdlib/libstdcpp3.hpp
@@ -9,6 +9,8 @@
 //  config for libstdc++ v3
 //  not much to go in here:

+#define BOOST_GNU_STDLIB 1
+
 #ifdef __GLIBCXX__
 #define BOOST_STDLIB "GNU libstdc++ version " BOOST_STRINGIZE(__GLIBCXX__)
 #else
@@ -31,7 +33,8 @@

 #ifdef __GLIBCXX__ // gcc 3.4 and greater:
 #  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
-        || defined(_GLIBCXX__PTHREADS)
+        || defined(_GLIBCXX__PTHREADS) \
+        || defined(_GLIBCXX_HAS_GTHREADS)
      //
      // If the std lib has thread support turned on, then turn it on in Boost
      // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT
@@ -102,10 +105,8 @@
 //
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
 #  define BOOST_NO_0X_HDR_ARRAY
-#  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_REGEX
 #  define BOOST_NO_0X_HDR_TUPLE
-#  define BOOST_NO_0X_HDR_TYPE_TRAITS
 #  define BOOST_NO_STD_UNORDERED  // deprecated; see following
 #  define BOOST_NO_0X_HDR_UNORDERED_MAP
 #  define BOOST_NO_0X_HDR_UNORDERED_SET
@@ -121,23 +122,33 @@
 #  define BOOST_NO_0X_HDR_MUTEX
 #  define BOOST_NO_0X_HDR_RATIO
 #  define BOOST_NO_0X_HDR_SYSTEM_ERROR
-#  define BOOST_NO_0X_HDR_THREAD
+#else
+#  define BOOST_HAS_TR1_COMPLEX_INVERSE_TRIG 
+#  define BOOST_HAS_TR1_COMPLEX_OVERLOADS 
+#endif
+
+#if (!defined(_GLIBCXX_HAS_GTHREADS) || !defined(_GLIBCXX_USE_C99_STDINT_TR1)) && (!defined(BOOST_NO_0X_HDR_CONDITION_VARIABLE) || !defined(BOOST_NO_0X_HDR_MUTEX))
+#  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  define BOOST_NO_0X_HDR_MUTEX
 #endif

 //  C++0x features in GCC 4.5.0 and later
 //
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
 #  define BOOST_NO_NUMERIC_LIMITS_LOWEST
+#  define BOOST_NO_0X_HDR_FUTURE
+#  define BOOST_NO_0X_HDR_RANDOM
 #endif

-//  C++0x headers not yet implemented
+//  C++0x features in GCC 4.5.0 and later
 //
-#  define BOOST_NO_0X_HDR_CODECVT
-#  define BOOST_NO_0X_HDR_CONCEPTS
-#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
-#  define BOOST_NO_0X_HDR_FUTURE
-#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
-#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
 #  define BOOST_NO_0X_HDR_TYPEINDEX
+#endif
+//  C++0x headers not yet (fully!) implemented
+//
+#  define BOOST_NO_0X_HDR_THREAD
+#  define BOOST_NO_0X_HDR_TYPE_TRAITS
+#  define BOOST_NO_0X_HDR_CODECVT

 //  --- end ---
--- a/include/boost/config/stdlib/modena.hpp
+++ b/include/boost/config/stdlib/modena.hpp
@@ -27,14 +27,10 @@
 #  define BOOST_NO_0X_HDR_ARRAY
 #  define BOOST_NO_0X_HDR_CHRONO
 #  define BOOST_NO_0X_HDR_CODECVT
-#  define BOOST_NO_0X_HDR_CONCEPTS
 #  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
 #  define BOOST_NO_0X_HDR_FORWARD_LIST
 #  define BOOST_NO_0X_HDR_FUTURE
 #  define BOOST_NO_0X_HDR_INITIALIZER_LIST
-#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
-#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
 #  define BOOST_NO_0X_HDR_MUTEX
 #  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_RATIO
--- a/include/boost/config/stdlib/msl.hpp
+++ b/include/boost/config/stdlib/msl.hpp
@@ -51,14 +51,10 @@
 #  define BOOST_NO_0X_HDR_ARRAY
 #  define BOOST_NO_0X_HDR_CHRONO
 #  define BOOST_NO_0X_HDR_CODECVT
-#  define BOOST_NO_0X_HDR_CONCEPTS
 #  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
 #  define BOOST_NO_0X_HDR_FORWARD_LIST
 #  define BOOST_NO_0X_HDR_FUTURE
 #  define BOOST_NO_0X_HDR_INITIALIZER_LIST
-#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
-#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
 #  define BOOST_NO_0X_HDR_MUTEX
 #  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_RATIO
--- a/include/boost/config/stdlib/roguewave.hpp
+++ b/include/boost/config/stdlib/roguewave.hpp
@@ -10,6 +10,8 @@

 //  Rogue Wave std lib:

+#define BOOST_RW_STDLIB 1 
+
 #if !defined(__STD_RWCOMPILER_H__) && !defined(_RWSTD_VER)
 #  include <boost/config/no_tr1/utility.hpp>
 #  if !defined(__STD_RWCOMPILER_H__) && !defined(_RWSTD_VER)
@@ -152,19 +154,20 @@
 #  endif
 #endif

+#if _RWSTD_VER < 0x05000000
+#  define BOOST_NO_0X_HDR_ARRAY
+#endif
+// type_traits header is incomplete:
+#  define BOOST_NO_0X_HDR_TYPE_TRAITS
+//
 //  C++0x headers not yet implemented
 //
-#  define BOOST_NO_0X_HDR_ARRAY
 #  define BOOST_NO_0X_HDR_CHRONO
 #  define BOOST_NO_0X_HDR_CODECVT
-#  define BOOST_NO_0X_HDR_CONCEPTS
 #  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
 #  define BOOST_NO_0X_HDR_FORWARD_LIST
 #  define BOOST_NO_0X_HDR_FUTURE
 #  define BOOST_NO_0X_HDR_INITIALIZER_LIST
-#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
-#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
 #  define BOOST_NO_0X_HDR_MUTEX
 #  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_RATIO
@@ -172,7 +175,6 @@
 #  define BOOST_NO_0X_HDR_SYSTEM_ERROR
 #  define BOOST_NO_0X_HDR_THREAD
 #  define BOOST_NO_0X_HDR_TUPLE
-#  define BOOST_NO_0X_HDR_TYPE_TRAITS
 #  define BOOST_NO_0X_HDR_TYPEINDEX
 #  define BOOST_NO_STD_UNORDERED        // deprecated; see following
 #  define BOOST_NO_0X_HDR_UNORDERED_MAP
--- a/include/boost/config/stdlib/sgi.hpp
+++ b/include/boost/config/stdlib/sgi.hpp
@@ -121,14 +121,10 @@
 #  define BOOST_NO_0X_HDR_ARRAY
 #  define BOOST_NO_0X_HDR_CHRONO
 #  define BOOST_NO_0X_HDR_CODECVT
-#  define BOOST_NO_0X_HDR_CONCEPTS
 #  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
 #  define BOOST_NO_0X_HDR_FORWARD_LIST
 #  define BOOST_NO_0X_HDR_FUTURE
 #  define BOOST_NO_0X_HDR_INITIALIZER_LIST
-#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
-#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
 #  define BOOST_NO_0X_HDR_MUTEX
 #  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_RATIO
--- a/include/boost/config/stdlib/stlport.hpp
+++ b/include/boost/config/stdlib/stlport.hpp
@@ -215,14 +215,10 @@ namespace boost { using std::min; using std::max; }
 #  define BOOST_NO_0X_HDR_ARRAY
 #  define BOOST_NO_0X_HDR_CHRONO
 #  define BOOST_NO_0X_HDR_CODECVT
-#  define BOOST_NO_0X_HDR_CONCEPTS
 #  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
 #  define BOOST_NO_0X_HDR_FORWARD_LIST
 #  define BOOST_NO_0X_HDR_FUTURE
 #  define BOOST_NO_0X_HDR_INITIALIZER_LIST
-#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
-#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
 #  define BOOST_NO_0X_HDR_MUTEX
 #  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_RATIO
--- a/include/boost/config/stdlib/vacpp.hpp
+++ b/include/boost/config/stdlib/vacpp.hpp
@@ -27,14 +27,10 @@
 #  define BOOST_NO_0X_HDR_ARRAY
 #  define BOOST_NO_0X_HDR_CHRONO
 #  define BOOST_NO_0X_HDR_CODECVT
-#  define BOOST_NO_0X_HDR_CONCEPTS
 #  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
 #  define BOOST_NO_0X_HDR_FORWARD_LIST
 #  define BOOST_NO_0X_HDR_FUTURE
 #  define BOOST_NO_0X_HDR_INITIALIZER_LIST
-#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
-#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
 #  define BOOST_NO_0X_HDR_MUTEX
 #  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_RATIO
--- a/include/boost/config/suffix.hpp
+++ b/include/boost/config/suffix.hpp
@@ -341,6 +341,9 @@
 #if defined(BOOST_NO_0X_HDR_INITIALIZER_LIST) && !defined(BOOST_NO_INITIALIZER_LISTS)
 #  define BOOST_NO_INITIALIZER_LISTS
 #endif
+#if defined(BOOST_NO_INITIALIZER_LISTS) && !defined(BOOST_NO_0X_HDR_INITIALIZER_LIST)
+#  define BOOST_NO_0X_HDR_INITIALIZER_LIST
+#endif

 //
 // Set BOOST_HAS_RVALUE_REFS when BOOST_NO_RVALUE_REFERENCES is not defined
@@ -356,6 +359,13 @@
 #define BOOST_HAS_VARIADIC_TMPL
 #endif

+//
+// Set BOOST_NO_DECLTYPE_N3276 when BOOST_NO_DECLTYPE is defined
+//
+#if !defined(BOOST_NO_DECLTYPE_N3276) && defined(BOOST_NO_DECLTYPE)
+#define BOOST_NO_DECLTYPE_N3276
+#endif
+
 //  BOOST_HAS_ABI_HEADERS
 //  This macro gets set if we have headers that fix the ABI,
 //  and prevent ODR violations when linking to external libraries:
@@ -376,7 +386,7 @@
 //  works as expected with standard conforming compilers.  The resulting
 //  double inclusion of <cstddef> is harmless.

-# ifdef BOOST_NO_STDC_NAMESPACE
+# if defined(BOOST_NO_STDC_NAMESPACE) && defined(__cplusplus)
 #   include <cstddef>
    namespace std { using ::ptrdiff_t; using ::size_t; }
 # endif
@@ -395,7 +405,7 @@

 //  BOOST_NO_STD_MIN_MAX workaround  -----------------------------------------//

-#  ifdef BOOST_NO_STD_MIN_MAX
+#  if defined(BOOST_NO_STD_MIN_MAX) && defined(__cplusplus)

 namespace std {
  template <class _Tp>
@@ -506,7 +516,7 @@ namespace std {
 // but it's use may generate either warnings (with -ansi), or errors
 // (with -pedantic -ansi) unless it's use is prefixed by __extension__
 //
-#if defined(BOOST_HAS_LONG_LONG)
+#if defined(BOOST_HAS_LONG_LONG) && defined(__cplusplus)
 namespace boost{
 #  ifdef __GNUC__
   __extension__ typedef long long long_long_type;
@@ -560,7 +570,7 @@ namespace boost{
 //


-#if defined BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
+#if defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) && defined(__cplusplus)

 #  include "boost/type.hpp"
 #  include "boost/non_type.hpp"
@@ -598,9 +608,9 @@ namespace boost{

 // When BOOST_NO_STD_TYPEINFO is defined, we can just import
 // the global definition into std namespace:
-#ifdef BOOST_NO_STD_TYPEINFO
+#if defined(BOOST_NO_STD_TYPEINFO) && defined(__cplusplus)
 #include <typeinfo>
-namespace std{ using ::typeinfo; }
+namespace std{ using ::type_info; }
 #endif

 // ---------------------------------------------------------------------------//
@@ -625,6 +635,20 @@ namespace std{ using ::typeinfo; }
 #define BOOST_DO_JOIN( X, Y ) BOOST_DO_JOIN2(X,Y)
 #define BOOST_DO_JOIN2( X, Y ) X##Y

+//
+// Helper macros BOOST_NOEXCEPT, BOOST_NOEXCEPT_IF, BOOST_NOEXCEPT_EXPR
+// These aid the transition to C++11 while still supporting C++03 compilers
+//
+#ifdef BOOST_NO_NOEXCEPT
+#  define BOOST_NOEXCEPT
+#  define BOOST_NOEXCEPT_IF(Predicate)
+#  define BOOST_NOEXCEPT_EXPR(Expression) false
+#else
+#  define BOOST_NOEXCEPT noexcept
+#  define BOOST_NOEXCEPT_IF(Predicate) noexcept((Predicate))
+#  define BOOST_NOEXCEPT_EXPR(Expression) noexcept((Expression))
+#endif
+
 //
 // Set some default values for compiler/library/platform names.
 // These are for debugging config setup only:
@@ -639,10 +663,6 @@ namespace std{ using ::typeinfo; }
 #     if defined(unix) || defined(__unix) || defined(_XOPEN_SOURCE) \
         || defined(_POSIX_SOURCE)
 #        define BOOST_PLATFORM "Generic Unix"
-#        define BOOST_NIX            1 
-//#        define BOOST_GENETIC_NIX    1
-//#        define BOOST_TRADEMARK_NIX  1
-#        define BOOST_FUNCTIONAL_NIX 1
 #     else
 #        define BOOST_PLATFORM "Unknown"
 #     endif
@@ -668,5 +688,17 @@ namespace std{ using ::typeinfo; }

 #define BOOST_STATIC_CONSTEXPR  static BOOST_CONSTEXPR_OR_CONST

+// BOOST_FORCEINLINE ---------------------------------------------//
+// Macro to use in place of 'inline' to force a function to be inline
+#if !defined(BOOST_FORCEINLINE)
+#  if defined(_MSC_VER)
+#    define BOOST_FORCEINLINE __forceinline
+#  elif defined(__GNUC__) && __GNUC__ > 3
+#    define BOOST_FORCEINLINE inline __attribute__ ((always_inline))
+#  else
+#    define BOOST_FORCEINLINE inline
+#  endif
+#endif
+
 #endif

--- a/include/boost/config/warning_disable.hpp
+++ b/include/boost/config/warning_disable.hpp
@@ -23,7 +23,7 @@
 //  Note that THIS HEADER MUST NOT INCLUDE ANY OTHER HEADERS:
 //  not even std library ones!  Doing so may turn the warning
 //  off too late to be of any use.  For example the VC++ C4996
-//  warning can be omitted from <iosfwd> if that header is included
+//  warning can be emitted from <iosfwd> if that header is included
 //  before or by this one :-(
 //

--- a/include/boost/version.hpp
+++ b/include/boost/version.hpp
@@ -19,7 +19,7 @@
 //  BOOST_VERSION / 100 % 1000 is the minor version
 //  BOOST_VERSION / 100000 is the major version

-#define BOOST_VERSION 104600
+#define BOOST_VERSION 104900

 //
 //  BOOST_LIB_VERSION must be defined to be the same as BOOST_VERSION
@@ -27,7 +27,7 @@
 //  number, y is the minor version number, and z is the patch level if not 0.
 //  This is used by <config/auto_link.hpp> to select which library version to link to.

-#define BOOST_LIB_VERSION "1_46"
+#define BOOST_LIB_VERSION "1_49"

 #endif

--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -24,7 +24,8 @@ if $(is_unix)
 }

 test-suite config
-  :
+  : 
+    [ compile config_test_c.c ]
    [ run config_test.cpp 
          : #args
          : #input-files
--- a/test/all/Jamfile.v2
+++ b/test/all/Jamfile.v2
@@ -1,7 +1,7 @@
 #
 # Regression test Jamfile for boost configuration setup.
 # *** DO NOT EDIT THIS FILE BY HAND ***
-# This file was automatically generated on Sat Sep 25 16:53:42 2010
+# This file was automatically generated on Sun Nov 27 09:43:19 2011
 #  by libs/config/tools/generate.cpp
 # Copyright John Maddock.
 # Use, modification and distribution are subject to the 
@@ -31,9 +31,6 @@ test-suite "BOOST_HAS_BETHREADS" :
 test-suite "BOOST_HAS_CLOCK_GETTIME" : 
 [ run ../has_clock_gettime_pass.cpp ]
 [ compile-fail ../has_clock_gettime_fail.cpp ] ;
-test-suite "BOOST_HAS_CONCEPTS" : 
-[ run ../has_concepts_pass.cpp ]
-[ compile-fail ../has_concepts_fail.cpp ] ;
 test-suite "BOOST_HAS_DIRENT_H" : 
 [ run ../has_dirent_h_pass.cpp ]
 [ compile-fail ../has_dirent_h_fail.cpp ] ;
@@ -43,6 +40,9 @@ test-suite "BOOST_HAS_EXPM1" :
 test-suite "BOOST_HAS_FTIME" : 
 [ run ../has_ftime_pass.cpp ]
 [ compile-fail ../has_ftime_fail.cpp ] ;
+test-suite "BOOST_HAS_GETSYSTEMTIMEASFILETIME" : 
+[ run ../has_getsystemtimeasfiletime_pass.cpp ]
+[ compile-fail ../has_getsystemtimeasfiletime_fail.cpp ] ;
 test-suite "BOOST_HAS_GETTIMEOFDAY" : 
 [ run ../has_gettimeofday_pass.cpp ]
 [ compile-fail ../has_gettimeofday_fail.cpp ] ;
@@ -184,15 +184,9 @@ test-suite "BOOST_NO_0X_HDR_CHRONO" :
 test-suite "BOOST_NO_0X_HDR_CODECVT" : 
 [ run ../no_0x_hdr_codecvt_pass.cpp ]
 [ compile-fail ../no_0x_hdr_codecvt_fail.cpp ] ;
-test-suite "BOOST_NO_0X_HDR_CONCEPTS" : 
-[ run ../no_0x_hdr_concepts_pass.cpp ]
-[ compile-fail ../no_0x_hdr_concepts_fail.cpp ] ;
 test-suite "BOOST_NO_0X_HDR_CONDITION_VARIABLE" : 
 [ run ../no_0x_hdr_condition_variable_pass.cpp ]
 [ compile-fail ../no_0x_hdr_condition_variable_fail.cpp ] ;
-test-suite "BOOST_NO_0X_HDR_CONTAINER_CONCEPTS" : 
-[ run ../no_0x_hdr_container_concepts_pass.cpp ]
-[ compile-fail ../no_0x_hdr_container_concepts_fail.cpp ] ;
 test-suite "BOOST_NO_0X_HDR_FORWARD_LIST" : 
 [ run ../no_0x_hdr_forward_list_pass.cpp ]
 [ compile-fail ../no_0x_hdr_forward_list_fail.cpp ] ;
@@ -202,12 +196,6 @@ test-suite "BOOST_NO_0X_HDR_FUTURE" :
 test-suite "BOOST_NO_0X_HDR_INITIALIZER_LIST" : 
 [ run ../no_0x_hdr_initializer_list_pass.cpp ]
 [ compile-fail ../no_0x_hdr_initializer_list_fail.cpp ] ;
-test-suite "BOOST_NO_0X_HDR_ITERATOR_CONCEPTS" : 
-[ run ../no_0x_hdr_iterator_concepts_pass.cpp ]
-[ compile-fail ../no_0x_hdr_iterator_concepts_fail.cpp ] ;
-test-suite "BOOST_NO_0X_HDR_MEMORY_CONCEPTS" : 
-[ run ../no_0x_hdr_memory_concepts_pass.cpp ]
-[ compile-fail ../no_0x_hdr_memory_concepts_fail.cpp ] ;
 test-suite "BOOST_NO_0X_HDR_MUTEX" : 
 [ run ../no_0x_hdr_mutex_pass.cpp ]
 [ compile-fail ../no_0x_hdr_mutex_fail.cpp ] ;
@@ -271,9 +259,6 @@ test-suite "BOOST_NO_CHAR32_T" :
 test-suite "BOOST_NO_COMPLETE_VALUE_INITIALIZATION" : 
 [ run ../no_com_value_init_pass.cpp ]
 [ compile-fail ../no_com_value_init_fail.cpp ] ;
-test-suite "BOOST_NO_CONCEPTS" : 
-[ run ../no_concepts_pass.cpp ]
-[ compile-fail ../no_concepts_fail.cpp ] ;
 test-suite "BOOST_NO_CONSTEXPR" : 
 [ run ../no_constexpr_pass.cpp ]
 [ compile-fail ../no_constexpr_fail.cpp ] ;
@@ -295,6 +280,9 @@ test-suite "BOOST_NO_CWCTYPE" :
 test-suite "BOOST_NO_DECLTYPE" : 
 [ run ../no_decltype_pass.cpp ]
 [ compile-fail ../no_decltype_fail.cpp ] ;
+test-suite "BOOST_NO_DECLTYPE_N3276" : 
+[ run ../no_decltype_n3276_pass.cpp ]
+[ compile-fail ../no_decltype_n3276_fail.cpp ] ;
 test-suite "BOOST_DEDUCED_TYPENAME" : 
 [ run ../no_ded_typename_pass.cpp ]
 [ compile-fail ../no_ded_typename_fail.cpp ] ;
@@ -325,6 +313,9 @@ test-suite "BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS" :
 test-suite "BOOST_NO_EXTERN_TEMPLATE" : 
 [ run ../no_extern_template_pass.cpp ]
 [ compile-fail ../no_extern_template_fail.cpp ] ;
+test-suite "BOOST_NO_FENV_H" : 
+[ run ../no_fenv_h_pass.cpp ]
+[ compile-fail ../no_fenv_h_fail.cpp ] ;
 test-suite "BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS" : 
 [ run ../no_function_template_default_args_pass.cpp ]
 [ compile-fail ../no_function_template_default_args_fail.cpp ] ;
@@ -394,6 +385,9 @@ test-suite "BOOST_NO_POINTER_TO_MEMBER_TEMPLATE_PARAMETERS" :
 test-suite "BOOST_NO_NESTED_FRIENDSHIP" : 
 [ run ../no_nested_friendship_pass.cpp ]
 [ compile-fail ../no_nested_friendship_fail.cpp ] ;
+test-suite "BOOST_NO_NOEXCEPT" : 
+[ run ../no_noexcept_pass.cpp ]
+[ compile-fail ../no_noexcept_fail.cpp ] ;
 test-suite "BOOST_NO_NULLPTR" : 
 [ run ../no_nullptr_pass.cpp ]
 [ compile-fail ../no_nullptr_fail.cpp ] ;
@@ -505,6 +499,9 @@ test-suite "BOOST_NO_TYPENAME_WITH_CTOR" :
 test-suite "BOOST_NO_UNICODE_LITERALS" : 
 [ run ../no_unicode_literals_pass.cpp ]
 [ compile-fail ../no_unicode_literals_fail.cpp ] ;
+test-suite "BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX" : 
+[ run ../no_unified_init_pass.cpp ]
+[ compile-fail ../no_unified_init_fail.cpp ] ;
 test-suite "BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL" : 
 [ run ../no_using_breaks_adl_pass.cpp ]
 [ compile-fail ../no_using_breaks_adl_fail.cpp ] ;
--- a/test/boost_has_concepts.ipp
+++ b/test/boost_has_concepts.ipp
@@ -1,23 +0,0 @@
-//  Copyright (C) 2007 Douglas Gregor
-//  Use, modification and distribution are subject to the
-//  Boost Software License, Version 1.0. (See accompanying file
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/config for most recent version.
-
-//  MACRO:         BOOST_HAS_CONCEPTS
-//  TITLE:         concepts
-//  DESCRIPTION:   The compiler supports C++0x concepts
-
-namespace boost_has_concepts {
-
-concept C<typename T> { }
-
-concept_map C<int> { }
-
-int test()
-{
-   return 0;
-}
-
-}
--- a/test/boost_has_ftime.ipp
+++ b/test/boost_has_ftime.ipp
@@ -6,19 +6,17 @@
 //  See http://www.boost.org/libs/config for most recent version.

 //  MACRO:         BOOST_HAS_FTIME
-//  TITLE:         GetSystemTimeAsFileTime
-//  DESCRIPTION:   The platform supports Win32 API GetSystemTimeAsFileTime.
+//  TITLE:         The platform has FTIME.
+//  DESCRIPTION:   The platform supports the Win32 API type FTIME.

 #include <windows.h>


 namespace boost_has_ftime{

-void f()
+void f(FILETIME)
 {
    // this is never called, it just has to compile:
-   FILETIME ft;
-   GetSystemTimeAsFileTime(&ft);
 }

 int test()
--- a/test/boost_has_getsystemtimeasfiletime.ipp
+++ b/test/boost_has_getsystemtimeasfiletime.ipp
@@ -0,0 +1,30 @@
+//  (C) Copyright John Maddock 2011. 
+//  Use, modification and distribution are subject to the 
+//  Boost Software License, Version 1.0. (See accompanying file 
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org/libs/config for most recent version.
+
+//  MACRO:         BOOST_HAS_GETSYSTEMTIMEASFILETIME
+//  TITLE:         GetSystemTimeAsFileTime
+//  DESCRIPTION:   The platform supports Win32 API GetSystemTimeAsFileTime.
+
+#include <windows.h>
+
+
+namespace boost_has_getsystemtimeasfiletime{
+
+void f()
+{
+    // this is never called, it just has to compile:
+   FILETIME ft;
+   GetSystemTimeAsFileTime(&ft);
+}
+
+int test()
+{
+   return 0;
+}
+
+}
+
--- a/test/boost_no_0x_hdr_array.ipp
+++ b/test/boost_no_0x_hdr_array.ipp
@@ -16,7 +16,8 @@ namespace boost_no_0x_hdr_array {

 int test()
 {
-  return 0;
+  std::array<int, 3> a = { 1, 2, 3 };
+  return a.size() == 3 ? 0 : 1;
 }

 }
--- a/test/boost_no_0x_hdr_chrono.ipp
+++ b/test/boost_no_0x_hdr_chrono.ipp
@@ -16,6 +16,15 @@ namespace boost_no_0x_hdr_chrono {

 int test()
 {
+  using std::chrono::nanoseconds;
+  using std::chrono::microseconds;
+  using std::chrono::milliseconds;
+  using std::chrono::seconds;
+  using std::chrono::minutes;
+  using std::chrono::hours;
+  using std::chrono::system_clock;
+  using std::chrono::monotonic_clock;
+  using std::chrono::high_resolution_clock;
  return 0;
 }

--- a/test/boost_no_0x_hdr_codecvt.ipp
+++ b/test/boost_no_0x_hdr_codecvt.ipp
@@ -16,6 +16,9 @@ namespace boost_no_0x_hdr_codecvt {

 int test()
 {
+  using std::codecvt_utf8;
+  using std::codecvt_utf16;
+  using std::codecvt_utf8_utf16;
  return 0;
 }

--- a/test/boost_no_0x_hdr_concepts.ipp
+++ b/test/boost_no_0x_hdr_concepts.ipp
@@ -1,22 +0,0 @@
-//  (C) Copyright Beman Dawes 2009
-
-//  Use, modification and distribution are subject to the
-//  Boost Software License, Version 1.0. (See accompanying file
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/config for more information.
-
-//  MACRO:         BOOST_NO_0X_HDR_CONCEPTS
-//  TITLE:         C++0x header <concepts> unavailable
-//  DESCRIPTION:   The standard library does not supply C++0x header <concepts>
-
-#include <concepts>
-
-namespace boost_no_0x_hdr_concepts {
-
-int test()
-{
-  return 0;
-}
-
-}
--- a/test/boost_no_0x_hdr_condition_variable.ipp
+++ b/test/boost_no_0x_hdr_condition_variable.ipp
@@ -16,6 +16,8 @@ namespace boost_no_0x_hdr_condition_variable {

 int test()
 {
+  using std::condition_variable;
+  using std::condition_variable_any;
  return 0;
 }

--- a/test/boost_no_0x_hdr_container_concepts.ipp
+++ b/test/boost_no_0x_hdr_container_concepts.ipp
@@ -1,22 +0,0 @@
-//  (C) Copyright Beman Dawes 2009
-
-//  Use, modification and distribution are subject to the
-//  Boost Software License, Version 1.0. (See accompanying file
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/config for more information.
-
-//  MACRO:         BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
-//  TITLE:         C++0x header <container_concepts> unavailable
-//  DESCRIPTION:   The standard library does not supply C++0x header <container_concepts>
-
-#include <container_concepts>
-
-namespace boost_no_0x_hdr_container_concepts {
-
-int test()
-{
-  return 0;
-}
-
-}
--- a/test/boost_no_0x_hdr_forward_list.ipp
+++ b/test/boost_no_0x_hdr_forward_list.ipp
@@ -16,7 +16,8 @@ namespace boost_no_0x_hdr_forward_list {

 int test()
 {
-  return 0;
+  std::forward_list<int> l(2u, 2);
+  return *l.begin() == 2 ? 0 : 1;
 }

 }
--- a/test/boost_no_0x_hdr_future.ipp
+++ b/test/boost_no_0x_hdr_future.ipp
@@ -16,6 +16,19 @@ namespace boost_no_0x_hdr_future {

 int test()
 {
+  using std::is_error_code_enum;
+  using std::make_error_code;
+  using std::make_error_condition;
+  using std::future_category;
+  using std::future_error;
+  using std::promise;
+  using std::promise;
+  using std::promise;
+  using std::future;
+  using std::shared_future;
+  using std::atomic_future;
+  using std::packaged_task; // undefined
+  using std::async;
  return 0;
 }

--- a/test/boost_no_0x_hdr_initializer_list.ipp
+++ b/test/boost_no_0x_hdr_initializer_list.ipp
@@ -14,8 +14,13 @@

 namespace boost_no_0x_hdr_initializer_list {

+void foo(const std::initializer_list<const char*>& l)
+{
+}
+
 int test()
 {
+  foo( { "a", "b", "c" } );
  return 0;
 }

--- a/test/boost_no_0x_hdr_iterator_concepts.ipp
+++ b/test/boost_no_0x_hdr_iterator_concepts.ipp
@@ -1,22 +0,0 @@
-//  (C) Copyright Beman Dawes 2009
-
-//  Use, modification and distribution are subject to the
-//  Boost Software License, Version 1.0. (See accompanying file
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/config for more information.
-
-//  MACRO:         BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
-//  TITLE:         C++0x header <iterator_concepts> unavailable
-//  DESCRIPTION:   The standard library does not supply C++0x header <iterator_concepts>
-
-#include <iterator_concepts>
-
-namespace boost_no_0x_hdr_iterator_concepts {
-
-int test()
-{
-  return 0;
-}
-
-}
--- a/test/boost_no_0x_hdr_memory_concepts.ipp
+++ b/test/boost_no_0x_hdr_memory_concepts.ipp
@@ -1,22 +0,0 @@
-//  (C) Copyright Beman Dawes 2009
-
-//  Use, modification and distribution are subject to the
-//  Boost Software License, Version 1.0. (See accompanying file
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/config for more information.
-
-//  MACRO:         BOOST_NO_0X_HDR_MEMORY_CONCEPTS
-//  TITLE:         C++0x header <memory_concepts> unavailable
-//  DESCRIPTION:   The standard library does not supply C++0x header <memory_concepts>
-
-#include <memory_concepts>
-
-namespace boost_no_0x_hdr_memory_concepts {
-
-int test()
-{
-  return 0;
-}
-
-}
--- a/test/boost_no_0x_hdr_mutex.ipp
+++ b/test/boost_no_0x_hdr_mutex.ipp
@@ -16,6 +16,10 @@ namespace boost_no_0x_hdr_mutex {

 int test()
 {
+  using std::mutex;
+  using std::recursive_mutex;
+  using std::timed_mutex;
+  using std::recursive_timed_mutex;
  return 0;
 }

--- a/test/boost_no_0x_hdr_random.ipp
+++ b/test/boost_no_0x_hdr_random.ipp
@@ -16,6 +16,15 @@ namespace boost_no_0x_hdr_random {

 int test()
 {
+  using std::minstd_rand0;
+  using std::mt19937;
+  using std::mt19937_64;
+  using std::ranlux24_base;
+  using std::ranlux48_base;
+  using std::ranlux24;
+  using std::ranlux48;
+  using std::knuth_b;
+  using std::default_random_engine;
  return 0;
 }

--- a/test/boost_no_0x_hdr_ratio.ipp
+++ b/test/boost_no_0x_hdr_ratio.ipp
@@ -16,6 +16,21 @@ namespace boost_no_0x_hdr_ratio {

 int test()
 {
+  using std::atto;
+  using std::femto;
+  using std::pico;
+  using std::nano;
+  using std::micro;
+  using std::milli;
+  using std::centi;
+  using std::deci;
+  using std::deca;
+  using std::hecto;
+  using std::kilo;
+  using std::mega;
+  using std::tera;
+  using std::peta;
+  using std::exa;
  return 0;
 }

--- a/test/boost_no_0x_hdr_regex.ipp
+++ b/test/boost_no_0x_hdr_regex.ipp
@@ -16,6 +16,8 @@ namespace boost_no_0x_hdr_regex {

 int test()
 {
+  using std::regex;
+  using std::wregex;
  return 0;
 }

--- a/test/boost_no_0x_hdr_system_error.ipp
+++ b/test/boost_no_0x_hdr_system_error.ipp
@@ -16,6 +16,10 @@ namespace boost_no_0x_hdr_system_error {

 int test()
 {
+  using std::error_category;
+  using std::error_code;
+  using std::error_condition;
+  using std::system_error;
  return 0;
 }

--- a/test/boost_no_0x_hdr_thread.ipp
+++ b/test/boost_no_0x_hdr_thread.ipp
@@ -16,6 +16,11 @@ namespace boost_no_0x_hdr_thread {

 int test()
 {
+  using std::thread;
+  using std::this_thread::get_id;
+  using std::this_thread::yield;
+  using std::this_thread::sleep_until;
+  using std::this_thread::sleep_for;
  return 0;
 }

--- a/test/boost_no_0x_hdr_type_traits.ipp
+++ b/test/boost_no_0x_hdr_type_traits.ipp
@@ -16,6 +16,90 @@ namespace boost_no_0x_hdr_type_traits {

 int test()
 {
+  using std::integral_constant;
+  using std::true_type;
+  using std::false_type;
+  using std::is_void;
+  using std::is_integral;
+  using std::is_floating_point;
+  using std::is_array;
+  using std::is_pointer;
+  using std::is_lvalue_reference;
+  using std::is_rvalue_reference;
+  using std::is_member_object_pointer;
+  using std::is_member_function_pointer;
+  using std::is_enum;
+  using std::is_union;
+  using std::is_class;
+  using std::is_function;
+  using std::is_reference;
+  using std::is_arithmetic;
+  using std::is_fundamental;
+  using std::is_object;
+  using std::is_scalar;
+  using std::is_compound;
+  using std::is_member_pointer;
+  using std::is_const;
+  using std::is_volatile;
+  using std::is_trivial;
+  using std::is_trivially_copyable;
+  using std::is_standard_layout;
+  using std::is_pod;
+  using std::is_literal_type;
+  using std::is_empty;
+  using std::is_polymorphic;
+  using std::is_abstract;
+  using std::is_constructible;
+  using std::is_nothrow_constructible;
+  using std::has_default_constructor;
+  using std::has_copy_constructor;
+  using std::has_copy_assign;
+  using std::has_move_constructor;
+  using std::has_move_assign;
+  using std::has_trivial_default_constructor;
+  using std::has_trivial_copy_constructor;
+  using std::has_trivial_move_constructor;
+  using std::has_trivial_copy_assign;
+  using std::has_trivial_move_assign;
+  using std::has_trivial_destructor;
+  using std::has_nothrow_default_constructor;
+  using std::has_nothrow_copy_constructor;
+  using std::has_nothrow_move_constructor;
+  using std::has_nothrow_copy_assign;
+  using std::has_nothrow_move_assign;
+  using std::has_virtual_destructor;
+  using std::is_signed;
+  using std::is_unsigned;
+  using std::alignment_of;
+  using std::rank;
+  using std::extent;
+  using std::is_same;
+  using std::is_base_of;
+  using std::is_convertible;
+  using std::is_explicitly_convertible;
+  using std::remove_const;
+  using std::remove_volatile;
+  using std::remove_cv;
+  using std::add_const;
+  using std::add_volatile;
+  using std::add_cv;
+  using std::remove_reference;
+  using std::add_lvalue_reference;
+  using std::add_rvalue_reference;
+  using std::make_signed;
+  using std::make_unsigned;
+  using std::remove_extent;
+  using std::remove_all_extents;
+  using std::remove_pointer;
+  using std::add_pointer;
+  using std::aligned_storage;
+  using std::aligned_union;
+  using std::decay;
+  using std::enable_if;
+  using std::conditional;
+  using std::common_type;
+  using std::underlying_type;
+  using std::result_of;
  return 0;
 }

--- a/test/boost_no_0x_hdr_unordered_map.ipp
+++ b/test/boost_no_0x_hdr_unordered_map.ipp
@@ -16,7 +16,9 @@ namespace boost_no_0x_hdr_unordered_map {

 int test()
 {
-  return 0;
+  std::unordered_map<int, long> s1;
+  std::unordered_multimap<int, long> s2;
+  return s1.empty() && s2.empty() ? 0 : 1;
 }

 }
--- a/test/boost_no_0x_hdr_unordered_set.ipp
+++ b/test/boost_no_0x_hdr_unordered_set.ipp
@@ -16,7 +16,9 @@ namespace boost_no_0x_hdr_unordered_set {

 int test()
 {
-  return 0;
+  std::unordered_set<int> s1;
+  std::unordered_multiset<int> s2;
+  return s1.empty() && s2.empty() ? 0 : 1;
 }

 }
--- a/test/boost_no_char16_t.ipp
+++ b/test/boost_no_char16_t.ipp
@@ -13,9 +13,19 @@

 namespace boost_no_char16_t {

+//  Microsoft VC++ 2010, and possibly other compilers, provides
+//  a typedef for char16_t rather than a new type. We want that
+//  to be an error, so provide an overloaded function that will
+//  be ambiguous if char16_t is just a typedef.
+void f(const char16_t*){}
+void f(const unsigned short*){}
+void f(const unsigned int*){}
+void f(const unsigned long*){}
+
 int test()
 {
-  const char16_t* p = u"abc";
+  const char16_t* p;
+  f(p);
  return 0;
 }

--- a/test/boost_no_char32_t.ipp
+++ b/test/boost_no_char32_t.ipp
@@ -12,9 +12,19 @@

 namespace boost_no_char32_t {

+//  Microsoft VC++ 2010, and possibly other compilers, provides
+//  a typedef for char32_t rather than a new type. We want that
+//  to be an error, so provide an overloaded function that will
+//  be ambiguous if char16_t is just a typedef.
+void f(const char32_t*){}
+void f(const unsigned short*){}
+void f(const unsigned int*){}
+void f(const unsigned long*){}
+
 int test()
 {
-  const char32_t* p = U"abc";
+  const char32_t* p;
+  f(p);
  return 0;
 }

--- a/test/boost_no_concepts.ipp
+++ b/test/boost_no_concepts.ipp
@@ -1,22 +0,0 @@
-//  (C) Copyright Beman Dawes 2009
-
-//  Use, modification and distribution are subject to the
-//  Boost Software License, Version 1.0. (See accompanying file
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/config for more information.
-
-//  MACRO:         BOOST_NO_CONCEPTS
-//  TITLE:         C++0x concepts feature unavailable
-//  DESCRIPTION:   The compiler does not support the C++0x concepts feature
-
-namespace boost_no_concepts {
-
-concept Foo<typename T> { }
-
-int test()
-{
-  return 0;
-}
-
-}
--- a/test/boost_no_constexpr.ipp
+++ b/test/boost_no_constexpr.ipp
@@ -12,11 +12,34 @@

 namespace boost_no_constexpr {

+void quiet_warning(int){}
+
 constexpr int square(int x) { return x * x; }  // from N2235

+// from 5.19:
+constexpr const int* addr(const int& ir) { return &ir; }
+static const int x = 5;
+constexpr const int* xp = addr(x);
+
+struct A 
+{
+   constexpr A(int i) : val(i) { }
+   constexpr operator int() { return val; }
+   constexpr operator long() { return 43; }
+private:
+   int val;
+};
+
+template<int> struct X { };
+
+constexpr A a = 42;
+
+X<a> xx; // OK: unique conversion to int
+
 int test()
 {
  int i = square(5);
+  quiet_warning(i);
  return 0;
 }

--- a/test/boost_no_decltype.ipp
+++ b/test/boost_no_decltype.ipp
@@ -13,6 +13,8 @@

 namespace boost_no_decltype {

+void quiet_warning(int){}
+
 struct test_class
 {
   test_class() {}
@@ -39,8 +41,13 @@ int test()
 {
  int i;
  decltype(i) j;
+//  quiet_warning(j);
  decltype(get_test_class()) k;
+  #ifndef _MSC_VER 
+  // Although the VC++ decltype is buggy, we none the less enable support, 
+  // so don't test the bugs for now!
  baz(get_test_class);
+  #endif
  return 0;
 }

--- a/test/boost_no_decltype_n3276.ipp
+++ b/test/boost_no_decltype_n3276.ipp
@@ -0,0 +1,137 @@
+
+//  (C) Copyright Eric Niebler 2011
+
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org/libs/config for more information.
+
+//  MACRO:         BOOST_NO_DECLTYPE_N3276
+//  TITLE:         C++0x decltype v1.1 unavailable
+//  DESCRIPTION:   The compiler does not support extensions to C++0x
+//                 decltype as described in N3276 and accepted in Madrid,
+//                 March 2011:
+//                 <http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3276.pdf>
+
+namespace boost_no_decltype_n3276 {
+
+// A simplified result_of implementation.
+// that uses decltype.
+template<typename Sig>
+struct result_of;
+
+template<typename T>
+T& declvar();
+
+// use decltype
+template<typename Fun, typename T>
+struct result_of<Fun(T)>
+{
+    typedef decltype(declvar<Fun>()(declvar<T>())) type;
+};
+
+template<typename Fun, typename T, typename U>
+struct result_of<Fun(T, U)>
+{
+    typedef decltype(declvar<Fun>()(declvar<T>(), declvar<U>())) type;
+};
+
+// simple tuple type
+template<typename A0 = void, typename A1 = void, typename A2 = void>
+struct tuple;
+
+template<typename A0>
+struct tuple<A0, void, void>
+{
+    A0 a0_;
+
+    tuple(A0 const &a0)
+      : a0_(a0)
+    {}
+};
+
+template<typename A0, typename A1>
+struct tuple<A0, A1>
+{
+    A0 a0_;
+    A1 a1_;
+
+    tuple(A0 const &a0, A1 const & a1)
+      : a0_(a0)
+      , a1_(a1)
+    {}
+};
+
+// A node in an expression tree
+template<class Tag, class Args> // Args is a tuple.
+struct Expr;
+
+// A function object that builds expression nodes
+template<class Tag>
+struct MakeExpr
+{
+    template<class T>
+    Expr<Tag, tuple<T> > operator()(T const & t) const
+    {
+        return Expr<Tag, tuple<T> >(tuple<T>(t));
+    }
+
+    template<class T, typename U>
+    Expr<Tag, tuple<T, U> > operator()(T const & t, U const & u) const
+    {
+        return Expr<Tag, tuple<T, U> >(tuple<T, U>(t, u));
+    }
+};
+
+// Here are tag types that encode in an expression node
+// what operation created the node.
+struct Terminal;
+struct BinaryPlus;
+struct FunctionCall;
+
+typedef MakeExpr<Terminal> MakeTerminal;
+typedef MakeExpr<BinaryPlus> MakeBinaryPlus;
+typedef MakeExpr<FunctionCall> MakeFunctionCall;
+
+template<class Tag, class Args>
+struct Expr
+{
+    Args args_;
+
+    explicit Expr(Args const & t) : args_(t) {}
+
+    // An overloaded operator+ that creates a binary plus node
+    template<typename RTag, typename RArgs>
+    typename result_of<MakeBinaryPlus(Expr, Expr<RTag, RArgs>)>::type
+    operator+(Expr<RTag, RArgs> const &right) const
+    {
+        return MakeBinaryPlus()(*this, right);
+    }
+
+    // An overloaded function call operator that creates a unary
+    // function call node
+    typename result_of<MakeFunctionCall(Expr)>::type
+    operator()() const
+    {
+        return MakeFunctionCall()(*this);
+    }
+};
+
+int test()
+{
+    // This is a terminal in an expression tree
+    Expr<Terminal, tuple<int> > i = MakeTerminal()(42);
+
+    i + i; // OK, this creates a binary plus node.
+
+    i(); // OK, this creates a unary function-call node.
+         // NOTE: If N3276 has not been implemented, this
+         // line will set off an infinite cascade of template
+         // instantiations that will run the compiler out of
+         // memory.
+
+    return 0;
+}
+
+}
--- a/test/boost_no_defaulted_functions.ipp
+++ b/test/boost_no_defaulted_functions.ipp
@@ -10,6 +10,10 @@
 //  TITLE:         C++0x defaulted functions unavailable
 //  DESCRIPTION:   The compiler does not support C++0x defaulted functions

+#if defined(__GNUC__) && !defined(__GXX_EXPERIMENTAL_CXX0X__) && !defined(BOOST_INTEL_STDCXX0X)
+#  error Defaulted functions are not supported in non-C++0x mode
+#endif
+
 namespace boost_no_defaulted_functions {

  struct foo {
--- a/test/boost_no_deleted_functions.ipp
+++ b/test/boost_no_deleted_functions.ipp
@@ -10,6 +10,10 @@
 //  TITLE:         C++0x =delete functions unavailable
 //  DESCRIPTION:   The compiler does not support C++0x =delete functions

+#if defined(__GNUC__) && !defined(__GXX_EXPERIMENTAL_CXX0X__) && !defined(BOOST_INTEL_STDCXX0X)
+#  error Deleted functions are not supported in non-C++0x mode
+#endif
+
 namespace boost_no_deleted_functions {

  struct foo {
--- a/test/boost_no_explicit_cvt_ops.ipp
+++ b/test/boost_no_explicit_cvt_ops.ipp
@@ -10,8 +10,14 @@
 //  TITLE:         C++0x explicit conversion operators unavailable
 //  DESCRIPTION:   The compiler does not support C++0x explicit conversion operators

+#if defined(__GNUC__) && !defined(__GXX_EXPERIMENTAL_CXX0X__) && !defined(BOOST_INTEL_STDCXX0X)
+#  error This feature is not available in non-C++0x mode
+#endif
+
 namespace boost_no_explicit_conversion_operators {

+void quiet_warning(int){}
+
  struct foo {
    explicit operator int() { return 1; }
  };
@@ -20,6 +26,7 @@ int test()
 {
  foo f;
  int i = int(f);
+  quiet_warning(i);
  return 0;
 }

--- a/test/boost_no_fenv_h.ipp
+++ b/test/boost_no_fenv_h.ipp
@@ -8,21 +8,21 @@

 //  MACRO:         BOOST_NO_FENV_H
 //  TITLE:         fenv.h
-//  DESCRIPTION:   There is no POSIX <fenv.h> available. If <fenv.h> is
+//  DESCRIPTION:   There is no standard <fenv.h> available. If <fenv.h> is
 //                 available, <boost/detail/fenv.hpp> should be included
 //                 instead of directly including <fenv.h>.

-#include <boost/detail/fenv.hpp>
+#include <fenv.h>

 namespace boost_no_fenv_h {

 int test()
 {
-  /// POSIX required typedefs
+  /// C++0x required typedefs
  typedef ::fenv_t has_fenv_t;
  typedef ::fexcept_t has_fexcept_t;

-  /// POSIX required macros
+  /// C++0x required macros
  #if !defined(FE_DIVBYZERO)
    #error platform does not define FE_DIVBYZERO
  #endif
@@ -31,47 +31,27 @@ int test()
    #error platform does not define FE_INEXACT
  #endif

-  #if !defined(FE_INVALID)
-    #error platform does not define FE_INVALID
+  #if !defined(FE_ALL_EXCEPT)
+    #error platform does not define FE_ALL_EXCEPT
  #endif
+
+   int i;
+   fexcept_t fe;
+   fenv_t env;
  
-  #if !defined(FE_OVERFLOW)
-    #error platform does not define FE_OVERFLOW
-  #endif
+   i = feclearexcept(FE_ALL_EXCEPT);
+   i += fetestexcept(FE_ALL_EXCEPT); // All flags should be zero
+   i += fegetexceptflag(&fe, FE_ALL_EXCEPT);
+   i += fesetexceptflag(&fe, FE_ALL_EXCEPT);
+   i += feraiseexcept(0);
+   i += fesetround(fegetround());
+   i += fegetenv(&env);
+   i += fesetenv(&env);
+   i += feholdexcept(&env);
+   if(i)
+      i += feupdateenv(&env);

-  #if !defined(FE_UNDERFLOW)
-    #error platform does not define FE_UNDERFLOW
-  #endif
-  
-  #if !defined(FE_DOWNWARD)
-    #error platform does not define FE_DOWNWARD
-  #endif
- 
-  #if !defined(FE_TONEAREST)
-    #error platform does not define FE_TONEAREST
-  #endif
-  
-  #if !defined(FE_UPWARD)
-    #error platform does not define FE_UPWARD
-  #endif
-
-  #if !defined(FE_DFL_ENV)
-    #error platform does not define FE_DFL_ENV
-  #endif
-
-  int (*has_feclearexcept)(int) = ::feclearexcept;
-  int (*has_fegetenv)(fenv_t*) = ::fegetenv;
-  int (*has_fegetexcept)(fexcept_t*, int) = ::fegetexcept;
-  int (*has_fegetround)(void) = ::fegetround;
-  int (*has_feholdexcept)(fenv_t*) = ::feholdexcept;
-  int (*has_feraiseexcept)(int) = ::feraiseexcept;
-  int (*has_fesetenv)(const fenv_t*) = ::fesetenv;
-  int (*has_fesetexceptflag)(const fexcept_t*, int) = ::fesetexceptflag;
-  int (*has_fesetround)(int) = ::fesetround;
-  int (*has_fetestexcept)(int) = ::fetestexcept;
-  int (*has_feupdateenv)(const fenv_t*) = ::feupdateenv;
-
-  return 0;
+   return i;
 }

 }
--- a/test/boost_no_initializer_lists.ipp
+++ b/test/boost_no_initializer_lists.ipp
@@ -12,9 +12,12 @@

 #include <initializer_list>
 #include <vector>
+#include <string>

 namespace boost_no_initializer_lists {

+void quiet_warning(const std::initializer_list<int>&){}
+
 void f(std::initializer_list<int>)
 {
 }
@@ -24,6 +27,7 @@ int test()
    std::vector<std::string> v{"once", "upon", "a", "time"}; // See C++ std 8.5.4
    f( { 1, 2, 3, 4 } );
    std::initializer_list<int> x = { 1, 2 };
+    quiet_warning(x);
    return 0;
 }

--- a/test/boost_no_lambdas.ipp
+++ b/test/boost_no_lambdas.ipp
@@ -10,6 +10,10 @@
 //  TITLE:         C++0x lambda feature unavailable
 //  DESCRIPTION:   The compiler does not support the C++0x lambda feature

+#if defined(__GNUC__) && !defined(__GXX_EXPERIMENTAL_CXX0X__) && !defined(BOOST_INTEL_STDCXX0X)
+#  error This feature is not available in non-C++0x mode
+#endif
+
 namespace boost_no_lambdas {

 int test()
--- a/test/boost_no_noexcept.ipp
+++ b/test/boost_no_noexcept.ipp
@@ -0,0 +1,26 @@
+//  Copyright (C) 2011 Takaya Saito
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org/libs/config for most recent version.
+
+//  MACRO:         BOOST_NO_NOEXCEPT
+//  TITLE:         C++0x noexcept unavailable
+//  DESCRIPTION:   The compiler does not support C++0x noexcept
+
+namespace boost_no_noexcept {
+
+void quiet_warning(bool){}
+
+int f() noexcept ;
+int g() noexcept( noexcept( f() ) ) ;
+
+int test()
+{
+  bool b = noexcept( g() );
+  quiet_warning(b);
+  return 0;
+}
+
+}
--- a/test/boost_no_nullptr.ipp
+++ b/test/boost_no_nullptr.ipp
@@ -12,9 +12,12 @@

 namespace boost_no_nullptr {

+void quiet_warning(const int*){}
+
 int test()
 {
  int * p = nullptr;
+  quiet_warning(p);
  return 0;
 }

--- a/test/boost_no_raw_literals.ipp
+++ b/test/boost_no_raw_literals.ipp
@@ -12,10 +12,15 @@

 namespace boost_no_raw_literals {

+void quiet_warning(const char*){}
+void quiet_warning(const wchar_t*){}
+
 int test()
 {
  const char* s = R"(abc)";
+  quiet_warning(s);
  const wchar_t* ws = LR"(abc)";
+  quiet_warning(ws);
  return 0;
 }

--- a/test/boost_no_scoped_enums.ipp
+++ b/test/boost_no_scoped_enums.ipp
@@ -15,7 +15,14 @@ namespace boost_no_scoped_enums {
 int test()
 {
  enum class scoped_enum { yes, no, maybe };
-  return 0;
+  // This tests bug http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38064
+  bool b = (scoped_enum::yes == scoped_enum::yes) 
+   && (scoped_enum::yes != scoped_enum::no) 
+   && (scoped_enum::yes < scoped_enum::no) 
+   && (scoped_enum::yes <= scoped_enum::no) 
+   && (scoped_enum::no > scoped_enum::yes) 
+   && (scoped_enum::no >= scoped_enum::yes);
+  return b ? 0 : 1;
 }

 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Beman Dawes	be10269488	Release 1.49.0 beta 1 [SVN r76721]	2012-01-27 18:03:17 +00:00
John Maddock	6f18ead6db	Merge config changes from Trunk. [SVN r76339]	2012-01-07 17:29:04 +00:00
John Maddock	3b7ff73e9d	Merge config changes from Trunk. [SVN r76122]	2011-12-23 17:17:31 +00:00
Daniel James	7bd78dda03	Merge 1.49 initialisation. [SVN r75673]	2011-11-26 18:53:17 +00:00
John Maddock	e7dd982de7	Merge Boost.Config changes from Trunk - numerous small bug fixes plus a new Cray C++ config. Fixes #5607. Fixes #5941. Fixes #5878. [SVN r74889]	2011-10-10 11:50:55 +00:00
Eric Niebler	18be7dcf00	merge [72327] from trunk [SVN r73153]	2011-07-16 20:12:46 +00:00
Beman Dawes	0bcba7df38	1.48.0 release cycle initialization. Authorized by Beman. [SVN r73015]	2011-07-12 13:53:58 +00:00
John Maddock	72e2d4c24f	Merge missing changes from Trunk. Authorized by Daniel James. [SVN r72800]	2011-06-29 18:00:59 +00:00
Daniel James	a4c133c6ce	Merge config typo fix. Fixes #5581 . [SVN r72282]	2011-05-30 15:01:59 +00:00
John Maddock	8dd107358b	Merge changes from Trunk. Adds new macros BOOST_NO_NOEXCEPT and BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX. Fixes #4867. Fixes #5571. [SVN r72217]	2011-05-27 16:56:00 +00:00
Marshall Clow	20a331cd0e	Merge fixes to release; Fixes #1988 [SVN r71676]	2011-05-02 20:56:53 +00:00
John Maddock	dd3ebc8776	Merge Boost.Config changes to release. [SVN r71480]	2011-04-25 12:10:48 +00:00
Daniel James	98d2f9fc1d	Release: Merge fixed BOOST_LIB_VERSION from trunk. [SVN r70560]	2011-03-26 10:43:03 +00:00
Daniel James	29fd4a0f96	Release: merge preperation for 1.47.0. [SVN r70304]	2011-03-21 09:11:47 +00:00
John Maddock	df7e235df6	Regenerate with up to date autoconf - otherwise exhibits spurious failures. [SVN r69710]	2011-03-08 17:22:16 +00:00
John Maddock	34092fc1c1	Bring Boost.Config into line with Trunk. [SVN r69624]	2011-03-07 13:07:30 +00:00
Daniel James	01dc0e99a0	Merge prep for 1.46.1 [SVN r69468]	2011-03-02 08:38:42 +00:00