Release 1.47.0

[SVN r73007]
2011-07-11 22:16:03 +00:00
239 changed files with 2728 additions and 6626 deletions
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -56,7 +56,6 @@ boostbook standalone
    ;


-install pdfinstall : standalone/<format>pdf : <location>. <install-type>PDF ;
-explicit pdfinstall ;
+install pdf-install : standalone : <location>. <install-type>PDF ;


--- a/doc/configuring_boost.qbk
+++ b/doc/configuring_boost.qbk
@@ -111,7 +111,7 @@ There are two ways you can use this header:
 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
-__BOOST_CONFIG_USER_HEADER__ to the svn repository (something you will not
+__BOOST_CONFIG_USER_HEADER__ to the cvs repository (something you will not
 be thanked for!).

 * [*Option 2:]  give the header a more memorable name, and place it somewhere
@@ -237,7 +237,7 @@ than static libraries on Microsoft Windows (this macro is used to turn on
 to look for in a dll rather than in a static library).
 Note that there may be some libraries that can only be statically linked
 (Boost.Test for example) and others which may only be dynamically linked
-(Boost.Thread for example), in these cases this macro has no effect.
+(Boost.Threads for example), in these cases this macro has no effect.
 ]]
 [[`BOOST_`['WHATEVER]`_DYN_LINK`][
 Forces library "whatever" to be linked as a dll rather than a static library
@@ -248,7 +248,7 @@ to turn on `__declspec(dllimport)` modifiers, so that the compiler knows
 which symbols to look for in a dll rather than in a static library).
 Note that there may be some libraries that can only be statically linked
 (Boost.Test for example) and others which may only be dynamically linked
-(Boost.Thread for example), in these cases this macro is unsupported.
+(Boost.Threads for example), in these cases this macro is unsupported.
 ]]
 [[`BOOST_ALL_NO_LIB`][
 Tells the config system not to automatically select which libraries to link
@@ -307,7 +307,7 @@ boost macro being set implies that another must be set also.

 The following usage examples represent just a few of the possibilities:

-[section Example 1: creating our own frozen configuration]
+[section Example 1, creating our own frozen configuration]

 Lets suppose that we're building boost with Visual C++ 6, and STLport 4.0. Lets
 suppose also that we don't intend to update our compiler or standard library
@@ -346,8 +346,8 @@ configuration macros setting. In a case like this, you can define
 `BOOST_NO_COMPILER_CONFIG` either on the command line, or in __BOOST_CONFIG_USER_HEADER__,
 and miss out the compiler configuration header altogether (actually you miss out
 two headers, one which works out what the compiler is, and one that configures
-boost for it). This has two consequences: the first is that less code has to be
-compiled, and the second that you have removed a dependency on two boost headers.
+boost for it). This has two consequences: the first is that less code has to be c
+ompiled, and the second that you have removed a dependency on two boost headers.

 [endsect]

@@ -372,7 +372,7 @@ under the __BOOST_CONFIG_DIR__ `test/` sub-directory:
 [[`config_info.cpp`][
 Prints out a detailed description of your compiler/standard library/platform
 setup, plus your current boost configuration. The information provided by this
-program is useful in setting up the boost configuration files. If you report that
+program useful in setting up the boost configuration files. If you report that
 boost is incorrectly configured for your compiler/library/platform then please
 include the output from this program when reporting the changes required.
 ]]
--- a/doc/guidelines.qbk
+++ b/doc/guidelines.qbk
@@ -62,7 +62,7 @@ majority of compilers, such as namespaces, exceptions, RTTI, or templates.
 [section:warnings Disabling Compiler Warnings]

 The header `<boost/config/warning_disable.hpp>` can be used to disable
-certain compiler warnings that are hard or impossible to otherwise remove.
+certain compiler warings that are hard or impossible to otherwise remove.

 Note that:

--- 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.77.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.74.0">
 <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 boost_config_acknowledgements">
+<div class="section" lang="en">
 <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,8 +47,7 @@
 </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
--- 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.77.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.74.0">
 <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,7 +22,7 @@
 <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 boost_config_guidelines_for_boost_authors">
+<div class="section" lang="en">
 <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>
@@ -61,26 +61,26 @@
 <p>
      Note that:
    </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
+<div class="itemizedlist"><ul type="disc">
+<li>
          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 class="listitem">
+<li>
          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 class="listitem">
+<li>
          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 class="listitem">
+<li>
          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,45 +88,45 @@
          is no sensible default behavior, an #error message should describe the
          problem.
        </li>
-<li class="listitem">
+<li>
          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 class="listitem">
+<li>
          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 class="listitem">
+<li>
          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 boost_config_guidelines_for_boost_authors_warnings">
+<div class="section" lang="en">
 <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>
 </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>
-        can be used to disable certain compiler warnings that are hard or impossible
+        can be used to disable certain compiler warings that are hard or impossible
        to otherwise remove.
      </p>
 <p>
        Note that:
      </p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
+<div class="itemizedlist"><ul type="disc">
+<li>
            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 class="listitem">
+<li>
            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 class="listitem">
+<li>
            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 boost_config_guidelines_for_boost_authors_adding_new_defect_macros">
+<div class="section" lang="en">
 <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 class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
+<div class="itemizedlist"><ul type="disc">
+<li>
            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 class="listitem">
+<li>
            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 class="listitem">
+<li>
            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 class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
+<div class="itemizedlist"><ul type="disc">
+<li>
            Define the defect macro in those config headers that require it.
          </li>
-<li class="listitem">
+<li>
            Document the macro in this documentation (please do not forget this step!!)
          </li>
-<li class="listitem">
+<li>
            Commit everything.
          </li>
-<li class="listitem">
+<li>
            Keep an eye on the regression tests for new failures in Boost.Config
            caused by the addition.
          </li>
-<li class="listitem">
+<li>
            Start using the macro.
          </li>
 </ul></div>
 </div>
-<div class="section boost_config_guidelines_for_boost_authors_adding_new_feature_test_macros">
+<div class="section" lang="en">
 <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 boost_config_guidelines_for_boost_authors_modifying_the_boost_configuration_headers">
+<div class="section" lang="en">
 <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,8 +362,7 @@
 </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.77.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.74.0">
 <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 boost_config_rationale">
+<div class="section" lang="en">
 <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 boost_config_rationale_the_problem">
+<div class="section" lang="en">
 <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 boost_config_rationale_the_solution">
+<div class="section" lang="en">
 <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,8 +109,7 @@
 </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.77.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.74.0">
 <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">
+<div class="article" lang="en">
 <div class="titlepage">
 <div>
 <div><h2 class="title">
@@ -26,10 +26,9 @@
 <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="config.legal"></a><p>
+<a name="id996438"></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>
@@ -58,22 +57,18 @@
 </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_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_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_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___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.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.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
      Informational Macros</a></span></dt>
-<dt><span class="section"><a href="boost_config/boost_macro_reference.html#boost_config.boost_macro_reference.boost_deprecated_macros">Boost
-      Deprecated Macros</a></span></dt>
 <dt><span class="section"><a href="boost_config/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></dd>
@@ -97,7 +92,7 @@
 <dt><span class="section"><a href="boost_config/acknowledgements.html">Acknowledgements</a></span></dt>
 </dl>
 </div>
-<div class="section boost_config_configuring_boost_for_your_platform">
+<div class="section" lang="en">
 <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>
@@ -116,7 +111,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 boost_config_configuring_boost_for_your_platform_using_the_default_boost_configuration">
+<div class="section" lang="en">
 <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>
@@ -140,7 +135,7 @@
        and submitting a support request.
      </p>
 </div>
-<div class="section boost_config_configuring_boost_for_your_platform_the__boost_config_hpp__header">
+<div class="section" lang="en">
 <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>
@@ -171,12 +166,12 @@
        developers list.
      </p>
 </div>
-<div class="section boost_config_configuring_boost_for_your_platform_using_the_configure_script">
+<div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<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
+<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
      the configure script</a>
 </h3></div></div></div>
-<div class="important"><table border="0" summary="Important">
+<a name="config_config_script"></a><div class="important"><table border="0" summary="Important">
 <tr>
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="../../../../doc/src/images/important.png"></td>
 <th align="left">Important</th>
@@ -279,7 +274,7 @@
 <span class="keyword">export</span> <span class="identifier">CXXFLAGS</span><span class="special">=</span><span class="string">"-Aa -DAportable -D__HPACC_THREAD_SAFE_RB_TREE \
   -DRWSTD_MULTI_THREAD -DRW_MULTI_THREAD -D_REENTRANT -D_THREAD_SAFE"</span>
 <span class="keyword">export</span> <span class="identifier">LDFLAGS</span><span class="special">=</span><span class="string">"-DAportable"</span>
-<span class="keyword">export</span> <span class="identifier">LIBS</span><span class="special">=</span><span class="string">"-lpthread"</span>
+<span class="keyword">export</span> <span class="identifier">LIBS</span><span class="special">=</span><span class="string">"-lpthread"</span> 
 <span class="identifier">sh</span> <span class="special">./</span><span class="identifier">configure</span>
 </pre>
 <p>
@@ -292,15 +287,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 class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
+<div class="itemizedlist"><ul type="disc">
+<li>
            <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 svn repository (something you will not be thanked for!).
+            to the cvs repository (something you will not be thanked for!).
          </li>
-<li class="listitem">
+<li>
            <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
@@ -313,12 +308,12 @@
          </li>
 </ul></div>
 </div>
-<div class="section boost_config_configuring_boost_for_your_platform_user_settable_options">
+<div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<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
+<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
      settable options</a>
 </h3></div></div></div>
-<p>
+<a name="config_user_settable"></a><p>
        There are some configuration-options that represent user choices, rather
        than compiler defects or platform specific options. These are listed 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">user</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>
@@ -587,7 +582,7 @@
                  knows which symbols to look for in a dll rather than in a static
                  library). Note that there may be some libraries that can only be
                  statically linked (Boost.Test for example) and others which may
-                  only be dynamically linked (Boost.Thread for example), in these
+                  only be dynamically linked (Boost.Threads for example), in these
                  cases this macro has no effect.
                </p>
              </td>
@@ -609,7 +604,7 @@
                  knows which symbols to look for in a dll rather than in a static
                  library). Note that there may be some libraries that can only be
                  statically linked (Boost.Test for example) and others which may
-                  only be dynamically linked (Boost.Thread for example), in these
+                  only be dynamically linked (Boost.Threads for example), in these
                  cases this macro is unsupported.
                </p>
              </td>
@@ -679,14 +674,14 @@
 </tbody>
 </table></div>
 </div>
-<div class="section boost_config_configuring_boost_for_your_platform_advanced_configuration_usage">
+<div class="section" lang="en">
 <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>
 </h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"><a href="index.html#boost_config.configuring_boost_for_your_platform.advanced_configuration_usage.example_1__creating_our_own_frozen_configuration">Example
-        1: creating our own frozen configuration</a></span></dt>
+        1, creating our own frozen configuration</a></span></dt>
 <dt><span class="section"><a href="index.html#boost_config.configuring_boost_for_your_platform.advanced_configuration_usage.example_2__skipping_files_that_you_don_t_need">Example
        2: skipping files that you don't need</a></span></dt>
 <dt><span class="section"><a href="index.html#boost_config.configuring_boost_for_your_platform.advanced_configuration_usage.example_3__using_configure_script_to_freeze_the_boost_configuration">Example
@@ -723,10 +718,10 @@
 <p>
        The following usage examples represent just a few of the possibilities:
      </p>
-<div class="section boost_config_configuring_boost_for_your_platform_advanced_configuration_usage_example_1__creating_our_own_frozen_configuration">
+<div class="section" lang="en">
 <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>
+<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>
 </h4></div></div></div>
 <p>
          Lets suppose that we're building boost with Visual C++ 6, and STLport 4.0.
@@ -755,7 +750,7 @@
          yet supported by boost.
        </p>
 </div>
-<div class="section boost_config_configuring_boost_for_your_platform_advanced_configuration_usage_example_2__skipping_files_that_you_don_t_need">
+<div class="section" lang="en">
 <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>
@@ -770,11 +765,11 @@
          and miss out the compiler configuration header altogether (actually you
          miss out two headers, one which works out what the compiler is, and one
          that configures boost for it). This has two consequences: the first is
-          that less code has to be compiled, and the second that you have removed
+          that less code has to be c ompiled, and the second that you have removed
          a dependency on two boost headers.
        </p>
 </div>
-<div class="section boost_config_configuring_boost_for_your_platform_advanced_configuration_usage_example_3__using_configure_script_to_freeze_the_boost_configuration">
+<div class="section" lang="en">
 <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>
@@ -787,7 +782,7 @@
        </p>
 </div>
 </div>
-<div class="section boost_config_configuring_boost_for_your_platform_testing_the_boost_configuration">
+<div class="section" lang="en">
 <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>
@@ -826,10 +821,10 @@
                <p>
                  Prints out a detailed description of your compiler/standard library/platform
                  setup, plus your current boost configuration. The information provided
-                  by this program is useful in setting up the boost configuration
-                  files. If you report that boost is incorrectly configured for your
-                  compiler/library/platform then please include the output from this
-                  program when reporting the changes required.
+                  by this program useful in setting up the boost configuration files.
+                  If you report that boost is incorrectly configured for your compiler/library/platform
+                  then please include the output from this program when reporting
+                  the changes required.
                </p>
              </td>
 </tr>
@@ -951,7 +946,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: April 28, 2013 at 17:55:14 GMT</small></p></td>
+<td align="left"><p><small>Last revised: May 09, 2011 at 11:33:33 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 C++03 defects]
+[section Macros that describe defects]

-The following macros all describe features that are required by the C++03 standard,
+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 2003 standard.
+compiler's conformance with the standard.


 [table
@@ -28,7 +28,7 @@ compiler's conformance with the 2003 standard.


 [[`BOOST_BCB_PARTIAL_SPECIALIZATION_BUG`][Compiler][
-The compiler exhibits certain partial specialisation bug - probably Borland
+The compiler exibits certain partial specialisation bug - probably Borland
 C++ Builder specific.
 ]]
 [[`BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL`][Compiler][
@@ -149,13 +149,8 @@ The C++ implementation does not provide the `<limits>` header. Never check for
 this symbol in library code; always include `<boost/limits.hpp>`, which
 guarantees to provide `std::numeric_limits`.
 ]]
-[[`BOOST_NO_CXX11_NUMERIC_LIMITS`][Standard library][
-C++11 additions to `std::numeric_limits` are not available for use.
-`static function numeric_limits<T>::lowest()` the lowest finite value representable by the numeric type.
-`static int const max_digits10` the number of decimal digits that are required to make sure that two distinct values of the type have distinct decimal representations.
-`template<> class numeric_limits<char16_t>;`, see also `BOOST_NO_CXX11_CHAR16_T`, 
-`template<> class numeric_limits<char32_t>;` see also `BOOST_NO_CXX11_CHAR32_T`.
-Replaces BOOST_NO_NUMERIC_LIMITS_LOWEST.
+[[`BOOST_NO_NUMERIC_LIMITS_LOWEST`][Standard library][
+Static function `numeric_limits<T>::lowest()` is not available for use.
 ]]
 [[`BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS`][Standard library][
 Constants such as `numeric_limits<T>::is_signed` are not available for use
@@ -353,10 +348,7 @@ 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 type FTIME.
-]]
-[[`BOOST_HAS_GETSYSTEMTIMEASFILETIME`][Platform][
-The platform has the Win32 API GetSystemTimeAsFileTime.
+The platform has the Win32 API `GetSystemTimeAsFileTime`.
 ]]
 [[`BOOST_HAS_GETTIMEOFDAY`][Platform][
 The platform has the POSIX API `gettimeofday`.
@@ -368,9 +360,6 @@ the names of the header needed to access hash_set and hash_map;
 `BOOST_STD_EXTENSION_NAMESPACE` will provide the namespace in which the two
 class templates reside.
 ]]
-[[`BOOST_HAS_INT128`][Compiler][
-The compiler has `__int128` and `unsigned __int128` as native types which are distinct
-from all the regular C++ integer types.]]
 [[`BOOST_HAS_LOG1P`][Platform][
 The platform has the functions `log1p`, `log1pf` and `log1pl` in `<math.h>`.
 ]]
@@ -429,9 +418,7 @@ The standard library lacks a conforming `std::use_facet`, but has a workaround
 class-version that does the job. This is primarily for the STLport std lib.
 ]]
 [[`BOOST_HAS_TR1_ARRAY`][Standard library][
-The library has a TR1 conforming version of `<array>`.  This macro is only guaranteed
-to be defined after including one of the headers from Boost.TR1.  Further this macro
-is now deprecated in favour of BOOST_NO_CXX11_HDR_ARRAY.
+The library has a TR1 conforming version of `<array>`.
 ]]
 [[`BOOST_HAS_TR1_COMPLEX_OVERLOADS`][Standard library][
 The library has a version of `<complex>` that supports passing scalars to the
@@ -442,74 +429,46 @@ The library has a version of `<complex>` that includes the new inverse trig
 functions from TR1.
 ]]
 [[`BOOST_HAS_TR1_REFERENCE_WRAPPER`][Standard library][
-The library has TR1 conforming reference wrappers in `<functional>`.  This macro is only guaranteed
-to be defined after including one of the headers from Boost.TR1.  Further this macro
-is now deprecated in favour of BOOST_NO_CXX11_HDR_FUNCTIONAL.
+The library has TR1 conforming reference wrappers in `<functional>`.
 ]]
 [[`BOOST_HAS_TR1_RESULT_OF`][Standard library][
-The library has a TR1 conforming result_of template in `<functional>`.  This macro is only guaranteed
-to be defined after including one of the headers from Boost.TR1.  Further this macro
-is now deprecated in favour of BOOST_NO_CXX11_HDR_FUNCTIONAL.
+The library has a TR1 conforming result_of template in `<functional>`.
 ]]
 [[`BOOST_HAS_TR1_MEM_FN`][Standard library][
-The library has a TR1 conforming mem_fn function template in `<functional>`.  This macro is only guaranteed
-to be defined after including one of the headers from Boost.TR1.  Further this macro
-is now deprecated in favour of BOOST_NO_CXX11_HDR_FUNCTIONAL.
+The library has a TR1 conforming mem_fn function template in `<functional>`.
 ]]
 [[`BOOST_HAS_TR1_BIND`][Standard library][
-The library has a TR1 conforming bind function template in `<functional>`.  This macro is only guaranteed
-to be defined after including one of the headers from Boost.TR1.  Further this macro
-is now deprecated in favour of BOOST_NO_CXX11_HDR_FUNCTIONAL.
+The library has a TR1 conforming bind function template in `<functional>`.
 ]]
 [[`BOOST_HAS_TR1_FUNCTION`][Standard library][
-The library has a TR1 conforming function class template in `<functional>`.  This macro is only guaranteed
-to be defined after including one of the headers from Boost.TR1.  Further this macro
-is now deprecated in favour of BOOST_NO_CXX11_HDR_FUNCTIONAL.
+The library has a TR1 conforming function class template in `<functional>`.
 ]]
 [[`BOOST_HAS_TR1_HASH`][Standard library][
-The library has a TR1 conforming hash function template in `<functional>`.  This macro is only guaranteed
-to be defined after including one of the headers from Boost.TR1.  Further this macro
-is now deprecated in favour of BOOST_NO_CXX11_HDR_FUNCTIONAL.
+The library has a TR1 conforming hash function template in `<functional>`.
 ]]
 [[`BOOST_HAS_TR1_SHARED_PTR`][Standard library][
-The library has a TR1 conforming `shared_ptr` class template in `<memory>`.  This macro is only guaranteed
-to be defined after including one of the headers from Boost.TR1.  Further this macro
-is now deprecated in favour of BOOST_NO_CXX11_SMART_PTR.
+The library has a TR1 conforming `shared_ptr` class template in `<memory>`.
 ]]
 [[`BOOST_HAS_TR1_RANDOM`][Standard library][
-The library has a TR1 conforming version of `<random>`.  This macro is only guaranteed
-to be defined after including one of the headers from Boost.TR1.  Further this macro
-is now deprecated in favour of BOOST_NO_CXX11_HDR_RANDOM.
+The library has a TR1 conforming version of `<random>`.
 ]]
 [[`BOOST_HAS_TR1_REGEX`][Standard library][
-The library has a TR1 conforming version of `<regex>`.  This macro is only guaranteed
-to be defined after including one of the headers from Boost.TR1.  Further this macro
-is now deprecated in favour of BOOST_NO_CXX11_HDR_REGEX.
+The library has a TR1 conforming version of `<regex>`.
 ]]
 [[`BOOST_HAS_TR1_TUPLE`][Standard library][
-The library has a TR1 conforming version of `<tuple>`.  This macro is only guaranteed
-to be defined after including one of the headers from Boost.TR1.  Further this macro
-is now deprecated in favour of BOOST_NO_CXX11_HDR_TUPLE.
+The library has a TR1 conforming version of `<tuple>`.
 ]]
 [[`BOOST_HAS_TR1_TYPE_TRAITS`][Standard library][
-The library has a TR1 conforming version of `<type_traits>`.  This macro is only guaranteed
-to be defined after including one of the headers from Boost.TR1.  Further this macro
-is now deprecated in favour of BOOST_NO_CXX11_HDR_TYPE_TRAITS.
+The library has a TR1 conforming version of `<type_traits>`.
 ]]
 [[`BOOST_HAS_TR1_UTILITY`][Standard library][
-The library has the TR1 additions to `<utility>` (tuple interface to `std::pair`).  This macro is only guaranteed
-to be defined after including one of the headers from Boost.TR1.  Further this macro
-is now deprecated in favour of BOOST_NO_CXX11_HDR_TUPLE.
+The library has the TR1 additions to `<utility>` (tuple interface to `std::pair`).
 ]]
 [[`BOOST_HAS_TR1_UNORDERED_MAP`][Standard library][
-The library has a TR1 conforming version of `<unordered_map>`.  This macro is only guaranteed
-to be defined after including one of the headers from Boost.TR1.  Further this macro
-is now deprecated in favour of BOOST_NO_CXX11_HDR_UNORDERED_MAP.
+The library has a TR1 conforming version of `<unordered_map>`.
 ]]
 [[`BOOST_HAS_TR1_UNORDERED_SET`][Standard library][
-The library has a TR1 conforming version of `<unordered_set>`.  This macro is only guaranteed
-to be defined after including one of the headers from Boost.TR1.  Further this macro
-is now deprecated in favour of BOOST_NO_CXX11_HDR_UNORDERED_SET.
+The library has a TR1 conforming version of `<unordered_set>`.
 ]]
 [[`BOOST_HAS_TR1`][Standard library][
 Implies all the other `BOOST_HAS_TR1_*` macros should be set.
@@ -552,10 +511,11 @@ standard).

 [endsect]

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

-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.
+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.


 [table
@@ -568,207 +528,112 @@ The compiler supports  concepts.

 [endsect]

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

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

 [table
 [[Macro     ][Description     ]]

-[[`BOOST_NO_CXX11_ALLOCATOR`][The standard library does not provide a C++11 version of `std::allocator` in <memory>.]]
-[[`BOOST_NO_CXX11_ATOMIC_SP`][The standard library <memory> does not support atomic smart pointer operations.]]
-[[`BOOST_NO_CXX11_HDR_ARRAY`][The standard library does not provide header <array>.]]
-[[`BOOST_NO_CXX11_HDR_CHRONO`][The standard library does not provide header <chrono>.]]
-[[`BOOST_NO_CXX11_HDR_CODECVT`][The standard library does not provide header <codecvt>.]]
-[[`BOOST_NO_CXX11_HDR_CONDITION_VARIABLE`][The standard library does not provide header <condition_variable>.]]
-[[`BOOST_NO_CXX11_HDR_FORWARD_LIST`][The standard library does not provide header <forward_list>.]]
-[[`BOOST_NO_CXX11_HDR_FUNCTIONAL`][The standard library does not provide a C++11 compatible version of <functional>.]]
-[[`BOOST_NO_CXX11_HDR_FUTURE`][The standard library does not provide header <future>.]]
-[[`BOOST_NO_CXX11_HDR_INITIALIZER_LIST`][The standard library does not provide header <initializer_list>.]]
-[[`BOOST_NO_CXX11_HDR_MUTEX`][The standard library does not provide header <mutex>.]]
-[[`BOOST_NO_CXX11_HDR_RANDOM`][The standard library does not provide header <random>.]]
-[[`BOOST_NO_CXX11_HDR_RATIO`][The standard library does not provide header <ratio>.]]
-[[`BOOST_NO_CXX11_HDR_REGEX`][The standard library does not provide header <regex>.]]
-[[`BOOST_NO_CXX11_HDR_SYSTEM_ERROR`][The standard library does not provide header <system_error>.]]
-[[`BOOST_NO_CXX11_HDR_THREAD`][The standard library does not provide header <thread>.]]
-[[`BOOST_NO_CXX11_HDR_TUPLE`][The standard library does not provide header <tuple>.]]
-[[`BOOST_NO_CXX11_HDR_TYPEINDEX`][The standard library does not provide header <typeindex>.]]
-[[`BOOST_NO_CXX11_HDR_TYPE_TRAITS`][The standard library does not provide header <type_traits>.]]
-[[`BOOST_NO_CXX11_HDR_UNORDERED_MAP`][The standard library does not provide header <unordered_map>.]]
-[[`BOOST_NO_CXX11_HDR_UNORDERED_SET`][The standard library does not provide header <unordered_set>.]]
-[[`BOOST_NO_CXX11_SMART_PTR`][The standard library header <memory> has no shared_ptr and unique_ptr.]]
+[[`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_CONDITION_VARIABLE`][The standard library does not provide header <condition_variable>.]]
+[[`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_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>.]]
+[[`BOOST_NO_0X_HDR_REGEX`][The standard library does not provide header <regex>.]]
+[[`BOOST_NO_0X_HDR_SYSTEM_ERROR`][The standard library does not provide header <system_error>.]]
+[[`BOOST_NO_0X_HDR_THREAD`][The standard library does not provide header <thread>.]]
+[[`BOOST_NO_0X_HDR_TUPLE`][The standard library does not provide header <tuple>.]]
+[[`BOOST_NO_0X_HDR_TYPEINDEX`][The standard library does not provide header <typeindex>.]]
+[[`BOOST_NO_0X_HDR_TYPE_TRAITS`][The standard library does not provide header <type_traits>.]]
+[[`BOOST_NO_0X_HDR_UNORDERED_MAP`][The standard library does not provide header <unordered_map>.]]
+[[`BOOST_NO_0X_HDR_UNORDERED_SET`][The standard library does not provide header <unordered_set>.]]

-[[`BOOST_NO_CXX11_AUTO_DECLARATIONS`][The compiler does not support
+[[`BOOST_NO_AUTO_DECLARATIONS`][The compiler does not support
 type deduction for variables declared with the `auto` keyword (`auto var = ...;`).
 ]]                       
-[[`BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS`][The compiler does not support
+[[`BOOST_NO_AUTO_MULTIDECLARATIONS`][The compiler does not support
 type deduction for multiple variables declared with the `auto` keyword (`auto var = ..., *ptr = ...;`).
 ]]                       
-[[`BOOST_NO_CXX11_CHAR16_T`][The compiler does not support
+[[`BOOST_NO_CHAR16_T`][The compiler does not support
 type `char16_t`. 
 ]]                       
-[[`BOOST_NO_CXX11_CHAR32_T`][The compiler does not support 
+[[`BOOST_NO_CHAR32_T`][The compiler does not support 
 type `char32_t`. 
 ]]                       
-[[`BOOST_NO_CXX11_TEMPLATE_ALIASES`][The compiler does not support template aliases. 
+[[`BOOST_NO_TEMPLATE_ALIASES`][The compiler does not support template aliases. 
 ]]                      
-[[`BOOST_NO_CXX11_CONSTEXPR`][The compiler does not support 
+[[`BOOST_NO_CONSTEXPR`][The compiler does not support 
 `constexpr`. 
 ]]                      
-[[`BOOST_NO_CXX11_DECLTYPE`][The compiler does not support 
+[[`BOOST_NO_DECLTYPE`][The compiler does not support 
 `decltype`. 
 ]]                       
-[[`BOOST_NO_CXX11_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_CXX11_DEFAULTED_FUNCTIONS`][The compiler does not support 
+[[`BOOST_NO_DEFAULTED_FUNCTIONS`][The compiler does not support 
 defaulted (`= default`) functions.  
 ]]            
-[[`BOOST_NO_CXX11_DELETED_FUNCTIONS`][The compiler does not support 
+[[`BOOST_NO_DELETED_FUNCTIONS`][The compiler does not support 
 deleted (`= delete`) functions.              
 ]]              
-[[`BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS`][The compiler does not support 
+[[`BOOST_NO_EXPLICIT_CONVERSION_OPERATORS`][The compiler does not support 
 explicit conversion operators (`explicit operator T()`).              
 ]] 
-[[`BOOST_NO_CXX11_EXTERN_TEMPLATE`][The compiler does not support 
+[[`BOOST_NO_EXTERN_TEMPLATE`][The compiler does not support 
 explicit instantiation forward declarations for templates (`extern template ...`).
 ]]
-[[`BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS`][The compiler does not support
+[[`BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS`][The compiler does not support
 default template arguments for function templates.
 ]]
-[[`BOOST_NO_CXX11_LAMBDAS`][The compiler does not support Lambdas. 
-]]                      
-[[`BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS`][The compiler does not allow to
-pass local classes as template parameters (this macro intentionally does not
-control passing of unnamed types as template parameters, see also
-[@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm N2657]).
+[[`BOOST_NO_INITIALIZER_LISTS`][
+The C++ compiler does not support C++0x initializer lists.
 ]]
+[[`BOOST_NO_LAMBDAS`][The compiler does not support Lambdas. 
+]]                      
 [[`BOOST_NO_LONG_LONG`][The compiler does not support `long long`.
 ]]                
-[[`BOOST_NO_CXX11_NOEXCEPT`][The compiler does not support `noexcept`. 
+[[`BOOST_NO_NOEXCEPT`][The compiler does not support `noexcept`. 
 ]]                      
-[[`BOOST_NO_CXX11_NULLPTR`][The compiler does not support `nullptr`. 
+[[`BOOST_NO_NULLPTR`][The compiler does not support 'nullptr'. 
 ]]                      
-[[`BOOST_NO_CXX11_RANGE_BASED_FOR`][The compiler does not support
-range-based for statements. 
-]]                   
-[[`BOOST_NO_CXX11_RAW_LITERALS`][The compiler does not support
+[[`BOOST_NO_RAW_LITERALS`][The compiler does not support
 raw string literals. 
 ]]                   
-[[`BOOST_NO_CXX11_RVALUE_REFERENCES`][The compiler does not support
+[[`BOOST_NO_RVALUE_REFERENCES`][The compiler does not support
 r-value references. 
 ]]              
-[[`BOOST_NO_CXX11_SCOPED_ENUMS`][The compiler does not support
+[[`BOOST_NO_SCOPED_ENUMS`][The compiler does not support
 scoped enumerations (`enum class`). 
 ]]                   
-[[`BOOST_NO_CXX11_STATIC_ASSERT`][The compiler does not support
+[[`BOOST_NO_STATIC_ASSERT`][The compiler does not support
 `static_assert`. 
 ]]                  
-[[`BOOST_NO_CXX11_STD_UNORDERED`][The standard library does not support
+[[`BOOST_NO_STD_UNORDERD`][The standard library does not support
 <unordered_map> and <unordered_set>. 
 ]]                  
-[[`BOOST_NO_CXX11_UNICODE_LITERALS`][The compiler does not support
+[[`BOOST_NO_TEMPLATE_ALIASES`][The compiler does not support template aliases. 
+]]                      
+[[`BOOST_NO_UNICODE_LITERALS`][The compiler does not support
 Unicode (`u8`, `u`, `U`) literals. 
 ]] 
-[[`BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX`][The compiler does not support
+[[`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_CXX11_USER_DEFINED_LITERALS`][The compiler does not support user defined literals. 
-]]                      
-[[`BOOST_NO_CXX11_VARIADIC_TEMPLATES`][The compiler does not support
+[[`BOOST_NO_VARIADIC_TEMPLATES`][The compiler does not support
 variadic templates. 
 ]]
-[[`BOOST_NO_CXX11_VARIADIC_MACROS`][The compiler does not support
+[[`BOOST_NO_VARIADIC_MACROS`][The compiler does not support
 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        ][ 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_OR_NOTHROW
-  BOOST_NOEXCEPT_IF(Predicate)
-  BOOST_NOEXCEPT_EXPR(Expression)
-``
-][
-If `BOOST_NO_CXX11_NOEXCEPT` is defined (i.e. C++03 compliant compilers) these macros are defined as:
-[:
-``
-  #define BOOST_NOEXCEPT
-  #define BOOST_NOEXCEPT_OR_NOTHROW throw()
-  #define BOOST_NOEXCEPT_IF(Predicate)
-  #define BOOST_NOEXCEPT_EXPR(Expression) false
-``
-]
-If `BOOST_NO_CXX11_NOEXCEPT` is not defined (i.e. C++11 compliant compilers) they are defined as:
-[:
-``
-  #define BOOST_NOEXCEPT noexcept
-  #define BOOST_NOEXCEPT_OR_NOTHROW noexcept
-  #define BOOST_NOEXCEPT_IF(Predicate) noexcept((Predicate))
-  #define BOOST_NOEXCEPT_EXPR(Expression) noexcept((Expression))
-``
-]
-]]
-[[`BOOST_MSVC_ENABLE_2012_NOV_CTP`][
-For Microsoft Visual C++ 2012, enable the C++11 features supplied by the
-November 2012 Community Technology Preview. These features are not automatically
-enabled because the CTP is non-supported alpha code that is not recommended
-for production use. This macro must be defined before including any Boost headers,
-and must be defined for all translation units in the program, including Boost library builds.
-This macro will no longer have any effect once an official Microsoft
-release supports the CTP features.
-]]
-]
-
-[endsect]
-
 [#config_helpers]

 [section Boost Helper Macros]
@@ -864,41 +729,6 @@ struct foo{
 Normally evaluates to nothing, but evaluates to return x; if the compiler
 requires a return, even when it can never be reached.
 ]]
-[[`BOOST_FALLTHROUGH`][ 
-The BOOST_FALLTHROUGH macro can be used to annotate implicit fall-through 
-between switch labels: 
-`` 
- switch (x) { 
- case 40: 
- case 41: 
-    if (truth_is_out_there) { 
-       ++x; 
-       BOOST_FALLTHROUGH;  // Use instead of/along with annotations in 
-       // comments. 
-    } else { 
-      return x; 
-    } 
-    case 42: 
-       ... 
-`` 
-As shown in the example above, the BOOST_FALLTHROUGH macro should be 
-followed by a semicolon. It is designed to mimic control-flow statements 
-like 'break;', so it can be placed in most places where 'break;' can, but 
-only if there are no statements on the execution path between it and the 
-next switch label. 
-
-When compiled with Clang >3.2 in C++11 mode, the BOOST_FALLTHROUGH macro is 
-expanded to `[[clang::fallthrough]]` attribute, which is analysed when 
-performing switch labels fall-through diagnostic ('-Wimplicit-fallthrough'). 
-See clang [@http://clang.llvm.org/docs/LanguageExtensions.html#clang__fallthrough 
-documentation on language extensions for details.] 
-
-When used with unsupported compilers, the BOOST_FALLTHROUGH macro has no 
-effect on diagnostics. 
-
-In either case this macro has no effect on runtime behavior and performance 
-of code. 
-]] 
 [[`BOOST_EXPLICIT_TEMPLATE_TYPE(t)`
  `BOOST_EXPLICIT_TEMPLATE_NON_TYPE(t,v)`
  `BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(t)`
@@ -947,7 +777,7 @@ must be used when the macro invocation appears after a normal parameter
 declaration or after the invocation of another macro of this same group.
 ]]
 [[`BOOST_USE_FACET(Type, loc)`][
-When the standard library does not have a conforming `std::use_facet` there
+When the standard library does not have a comforming `std::use_facet` there
 are various workarounds available, but they differ from library to library.
 This macro provides a consistent way to access a locale's facets. For example,
 replace:
@@ -983,25 +813,37 @@ 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_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:
+[[`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:
 ``
-  template<class T>
-  BOOST_FORCEINLINE T& f(T& t)
-  {
-      return t;
-  }
+  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;
 ``
-
-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.
 ]]
 ]

@@ -1040,11 +882,6 @@ Defined to a normalised 9 digit version of _MSC_FULL_VER (which sometimes only h
 the macro has the form VVMMPPPPP where VV is the major version number, MM is the minor version number, and
 PPPPP is the compiler build number.
 ]]
-[[`BOOST_GCC`][`<boost/config.hpp>`][
-Defined if the compiler is really GCC, as opposed to one
-of the many other compilers that also define `__GNUC__`.  Has the value:
-`__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__`.
-]]
 [[`BOOST_INTEL`][`<boost/config.hpp>`][
 Defined if the compiler is an Intel compiler, takes the same value as the
 compiler version macro.
@@ -1079,75 +916,6 @@ the configuration.

 [endsect]

-[#deprecated_macros]
-
-[section Boost Deprecated Macros]
-
-The following have been deprecated; please use the replacements instead.
-They will be removed in a future version of boost.
-
-[table
-
-[[Deprecated Macro][Replacement][When deprecated][When removed]]
-
-[[`BOOST_NO_0X_HDR_ARRAY`][`BOOST_NO_CXX11_HDR_ARRAY`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_CHRONO`][`BOOST_NO_CXX11_HDR_CHRONO`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_CODECVT`][`BOOST_NO_CXX11_HDR_CODECVT`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_CONDITION_VARIABLE`][`BOOST_NO_CXX11_HDR_CONDITION_VARIABLE`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_FORWARD_LIST`][`BOOST_NO_CXX11_HDR_FORWARD_LIST`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_FUTURE`][`BOOST_NO_CXX11_HDR_FUTURE`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_INITIALIZER_LIST`][`BOOST_NO_CXX11_HDR_INITIALIZER_LIST`][Boost 1.50][]]
-[[`BOOST_NO_INITIALIZER_LISTS`][`BOOST_NO_CXX11_HDR_INITIALIZER_LIST`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_MUTEX`][`BOOST_NO_CXX11_HDR_MUTEX`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_RANDOM`][`BOOST_NO_CXX11_HDR_RANDOM`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_RATIO`][`BOOST_NO_CXX11_HDR_RATIO`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_REGEX`][`BOOST_NO_CXX11_HDR_REGEX`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_SYSTEM_ERROR`][`BOOST_NO_CXX11_HDR_SYSTEM_ERROR`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_THREAD`][`BOOST_NO_CXX11_HDR_THREAD`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_TUPLE`][`BOOST_NO_CXX11_HDR_TUPLE`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_TYPE_TRAITS`][`BOOST_NO_CXX11_HDR_TYPE_TRAITS`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_TYPEINDEX`][`BOOST_NO_CXX11_HDR_TYPEINDEX`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_UNORDERED_SET`][`BOOST_NO_CXX11_HDR_UNORDERED_SET`][Boost 1.50][]]
-[[`BOOST_NO_0X_HDR_UNORDERED_MAP`][`BOOST_NO_CXX11_HDR_UNORDERED_MAP`][Boost 1.50][]]
-[[`BOOST_NO_STD_UNORDERED`][`BOOST_NO_CXX11_HDR_UNORDERED_SET`][Boost 1.50][]]
-[[][][][]]
-[[`BOOST_NO_AUTO_DECLARATIONS`][`BOOST_NO_CXX11_AUTO_DECLARATIONS`][Boost 1.51][]]
-[[`BOOST_NO_AUTO_MULTIDECLARATIONS`][`BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS`][Boost 1.51][]]
-[[`BOOST_NO_CHAR16_T`][`BOOST_NO_CXX11_CHAR16_T`][Boost 1.51][]]
-[[`BOOST_NO_CHAR32_T`][`BOOST_NO_CXX11_CHAR32_T`][Boost 1.51][]]
-[[`BOOST_NO_TEMPLATE_ALIASES`][`BOOST_NO_CXX11_TEMPLATE_ALIASES`][Boost 1.51][]]
-[[`BOOST_NO_CONSTEXPR`][`BOOST_NO_CXX11_CONSTEXPR`][Boost 1.51][]]
-[[`BOOST_NO_DECLTYPE`][`BOOST_NO_CXX11_DECLTYPE`][Boost 1.51][]]
-[[`BOOST_NO_DECLTYPE_N3276`][`BOOST_NO_CXX11_DECLTYPE_N3276`][Boost 1.51][]]
-[[`BOOST_NO_DEFAULTED_FUNCTIONS`][`BOOST_NO_CXX11_DEFAULTED_FUNCTIONS`][Boost 1.51][]]
-[[`BOOST_NO_DELETED_FUNCTIONS`][`BOOST_NO_CXX11_DELETED_FUNCTIONS`][Boost 1.51][]]
-[[`BOOST_NO_EXPLICIT_CONVERSION_OPERATORS`][`BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS`][Boost 1.51][]]
-[[`BOOST_NO_EXTERN_TEMPLATE`][`BOOST_NO_CXX11_EXTERN_TEMPLATE`][Boost 1.51][]]
-[[`BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS`][`BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS`][Boost 1.51][]]
-[[`BOOST_NO_LAMBDAS`][`BOOST_NO_CXX11_LAMBDAS`][Boost 1.51][]]
-[[`BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS`][`BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS`][Boost 1.51][]]
-[[`BOOST_NO_NOEXCEPT`][`BOOST_NO_CXX11_NOEXCEPT`][Boost 1.51][]]
-[[`BOOST_NO_NULLPTR`][`BOOST_NO_CXX11_NULLPTR`][Boost 1.51][]]
-[[`BOOST_NO_RAW_LITERALS`][`BOOST_NO_CXX11_RAW_LITERALS`][Boost 1.51][]]
-[[`BOOST_NO_RVALUE_REFERENCES`][`BOOST_NO_CXX11_RVALUE_REFERENCES`][Boost 1.51][]]
-[[`BOOST_NO_SCOPED_ENUMS`][`BOOST_NO_CXX11_SCOPED_ENUMS`][Boost 1.51][]]
-[[`BOOST_NO_STATIC_ASSERT`][`BOOST_NO_CXX11_STATIC_ASSERT`][Boost 1.51][]]
-[[`BOOST_NO_STD_UNORDERED`][`BOOST_NO_CXX11_STD_UNORDERED`][Boost 1.51][]]
-[[`BOOST_NO_UNICODE_LITERALS`][`BOOST_NO_CXX11_UNICODE_LITERALS`][Boost 1.51][]]
-[[`BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX`][`BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX`][Boost 1.51][]]
-[[`BOOST_NO_VARIADIC_TEMPLATES`][`BOOST_NO_CXX11_VARIADIC_TEMPLATES`][Boost 1.51][]]
-[[`BOOST_NO_VARIADIC_MACROS`][`BOOST_NO_CXX11_VARIADIC_MACROS`][Boost 1.51][]]
-[[`BOOST_NO_NUMERIC_LIMITS_LOWEST`][`BOOST_NO_CXX11_NUMERIC_LIMITS`][Boost 1.51][]]
-[[][][][]]
-[[`BOOST_HAS_STATIC_ASSERT`][`BOOST_NO_CXX11_STATIC_ASSERT` (negated)][Boost 1.53][]]
-[[`BOOST_HAS_VARIADIC_TMPL`][`BOOST_NO_CXX11_VARIADIC_TEMPLATES` (negated)][Boost 1.53][]]
-[[`BOOST_HAS_RVALUE_REFS`][`BOOST_NO_CXX11_RVALUE_REFERENCES` (negated)][Boost 1.53][]]
-[[`BOOST_HAS_CHAR_16_T`][`BOOST_NO_CXX11_CHAR_16_T` (negated)][Boost 1.53][]]
-[[`BOOST_HAS_CHAR_32_T`][`BOOST_NO_CXX11_CHAR_32_T` (negated)][Boost 1.53][]]
-]
-
-[endsect]
-
 [section Macros for libraries with separate source code]

 The following macros and helper headers are of use to authors whose libraries
--- a/include/boost/config/auto_link.hpp
+++ b/include/boost/config/auto_link.hpp
@@ -60,14 +60,14 @@ BOOST_LIB_THREAD_OPT: "-mt" for multithread builds, otherwise nothing.

 BOOST_LIB_RT_OPT:     A suffix that indicates the runtime library used,
                      contains one or more of the following letters after
-                      a hyphen:
+                      a hiphen:

                      s      static runtime (dynamic if not present).
                      g      debug/diagnostic runtime (release if not present).
                      y      Python debug/diagnostic runtime (release if not present).
                      d      debug build (release if not present).
-                      p      STLport build.
-                      n      STLport build without its IOStreams.
+                      g      debug/diagnostic runtime (release if not present).
+                      p      STLPort Build.

 BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.

@@ -114,69 +114,63 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 // select toolset if not defined already:
 //
 #ifndef BOOST_LIB_TOOLSET
-#  if defined(BOOST_MSVC) && (BOOST_MSVC < 1200)
-    // Note: no compilers before 1200 are supported
-#  elif defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-
-#    ifdef UNDER_CE
-       // eVC4:
-#      define BOOST_LIB_TOOLSET "evc4"
-#    else
-       // vc6:
-#      define BOOST_LIB_TOOLSET "vc6"
-#    endif
-
-#  elif defined(BOOST_MSVC) && (BOOST_MSVC < 1310)
-
-     // vc7:
-#    define BOOST_LIB_TOOLSET "vc7"
-
-#  elif defined(BOOST_MSVC) && (BOOST_MSVC < 1400)
-
-     // vc71:
-#    define BOOST_LIB_TOOLSET "vc71"
-
-#  elif defined(BOOST_MSVC) && (BOOST_MSVC < 1500)
-
-     // vc80:
-#    define BOOST_LIB_TOOLSET "vc80"
-
-#  elif defined(BOOST_MSVC) && (BOOST_MSVC < 1600)
-
-     // vc90:
-#    define BOOST_LIB_TOOLSET "vc90"
-
-#  elif defined(BOOST_MSVC) && (BOOST_MSVC < 1700)
-
-     // vc10:
-#    define BOOST_LIB_TOOLSET "vc100"
-
-#  elif defined(BOOST_MSVC)
-
-     // vc11:
-#    define BOOST_LIB_TOOLSET "vc110"
-
-#  elif defined(__BORLANDC__)
-
-     // CBuilder 6:
-#    define BOOST_LIB_TOOLSET "bcb"
-
-#  elif defined(__ICL)
-
-     // Intel C++, no version number:
-#    define BOOST_LIB_TOOLSET "iw"
-
-#  elif defined(__MWERKS__) && (__MWERKS__ <= 0x31FF )
-
-     // Metrowerks CodeWarrior 8.x
-#    define BOOST_LIB_TOOLSET "cw8"
-
-#  elif defined(__MWERKS__) && (__MWERKS__ <= 0x32FF )
-
-     // Metrowerks CodeWarrior 9.x
-#    define BOOST_LIB_TOOLSET "cw9"
+// Note: no compilers before 1200 are supported
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)

+#  ifdef UNDER_CE
+     // vc6:
+#    define BOOST_LIB_TOOLSET "evc4"
+#  else
+     // vc6:
+#    define BOOST_LIB_TOOLSET "vc6"
 #  endif
+
+#elif defined(BOOST_MSVC) && (BOOST_MSVC == 1300)
+
+   // vc7:
+#  define BOOST_LIB_TOOLSET "vc7"
+
+#elif defined(BOOST_MSVC) && (BOOST_MSVC == 1310)
+
+   // vc71:
+#  define BOOST_LIB_TOOLSET "vc71"
+
+#elif defined(BOOST_MSVC) && (BOOST_MSVC == 1400)
+
+   // vc80:
+#  define BOOST_LIB_TOOLSET "vc80"
+
+#elif defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
+
+   // vc90:
+#  define BOOST_LIB_TOOLSET "vc90"
+
+#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1600)
+
+   // vc10:
+#  define BOOST_LIB_TOOLSET "vc100"
+
+#elif defined(__BORLANDC__)
+
+   // CBuilder 6:
+#  define BOOST_LIB_TOOLSET "bcb"
+
+#elif defined(__ICL)
+
+   // Intel C++, no version number:
+#  define BOOST_LIB_TOOLSET "iw"
+
+#elif defined(__MWERKS__) && (__MWERKS__ <= 0x31FF )
+
+   // Metrowerks CodeWarrior 8.x
+#  define BOOST_LIB_TOOLSET "cw8"
+
+#elif defined(__MWERKS__) && (__MWERKS__ <= 0x32FF )
+
+   // Metrowerks CodeWarrior 9.x
+#  define BOOST_LIB_TOOLSET "cw9"
+
+#endif
 #endif // BOOST_LIB_TOOLSET

 //
@@ -202,11 +196,11 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 #        elif defined(_DEBUG)\
               && defined(BOOST_DEBUG_PYTHON) && defined(BOOST_LINKING_PYTHON)
 #            define BOOST_LIB_RT_OPT "-gydp"
-#            pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1")
+#            pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1")
 #            error "Build options aren't compatible with pre-built libraries"
 #        elif defined(_DEBUG)
 #            define BOOST_LIB_RT_OPT "-gdp"
-#            pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1")
+#            pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1")
 #            error "Build options aren't compatible with pre-built libraries"
 #        else
 #            define BOOST_LIB_RT_OPT "-p"
@@ -222,11 +216,11 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 #        elif defined(_DEBUG)\
               && defined(BOOST_DEBUG_PYTHON) && defined(BOOST_LINKING_PYTHON)
 #            define BOOST_LIB_RT_OPT "-gydpn"
-#            pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1")
+#            pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1")
 #            error "Build options aren't compatible with pre-built libraries"
 #        elif defined(_DEBUG)
 #            define BOOST_LIB_RT_OPT "-gdpn"
-#            pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1")
+#            pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1")
 #            error "Build options aren't compatible with pre-built libraries"
 #        else
 #            define BOOST_LIB_RT_OPT "-pn"
@@ -256,11 +250,11 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 #        elif defined(_DEBUG)\
               && defined(BOOST_DEBUG_PYTHON) && defined(BOOST_LINKING_PYTHON)
 #             define BOOST_LIB_RT_OPT "-sgydp"
-#            pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1")
+#            pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1")
 #            error "Build options aren't compatible with pre-built libraries"
 #        elif defined(_DEBUG)
 #             define BOOST_LIB_RT_OPT "-sgdp"
-#            pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1")
+#            pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1")
 #            error "Build options aren't compatible with pre-built libraries"
 #        else
 #            define BOOST_LIB_RT_OPT "-sp"
@@ -276,11 +270,11 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 #        elif defined(_DEBUG)\
               && defined(BOOST_DEBUG_PYTHON) && defined(BOOST_LINKING_PYTHON)
 #             define BOOST_LIB_RT_OPT "-sgydpn"
-#            pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1")
+#            pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1")
 #            error "Build options aren't compatible with pre-built libraries"
 #        elif defined(_DEBUG)
 #             define BOOST_LIB_RT_OPT "-sgdpn"
-#            pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1")
+#            pragma message("warning: STLPort debug versions are built with /D_STLP_DEBUG=1")
 #            error "Build options aren't compatible with pre-built libraries"
 #        else
 #            define BOOST_LIB_RT_OPT "-spn"
@@ -313,7 +307,7 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 // sanity check:
 //
 #if defined(__STL_DEBUG) || defined(_STLP_DEBUG)
-#error "Pre-built versions of the Boost libraries are not provided in STLport-debug form"
+#error "Pre-built versions of the Boost libraries are not provided in STLPort-debug form"
 #endif

 #  ifdef _RTLDLL
@@ -370,7 +364,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_THREAD_OPT BOOST_LIB_RT_OPT ".lib")
+#     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")
 #  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
@@ -47,7 +47,7 @@
 #       define BOOST_NO_OPERATORS_IN_NAMESPACE
 #     endif
 // Variadic macros do not exist for C++ Builder versions 5 and below
-#define BOOST_NO_CXX11_VARIADIC_MACROS
+#define BOOST_NO_VARIADIC_MACROS
 #   endif

 // Version 5.51 and below:
@@ -150,14 +150,14 @@
 // C++0x Macros:
 //
 #if !defined( BOOST_CODEGEAR_0X_SUPPORT ) || (__BORLANDC__ < 0x610)
-#  define BOOST_NO_CXX11_CHAR16_T
-#  define BOOST_NO_CXX11_CHAR32_T
-#  define BOOST_NO_CXX11_DECLTYPE
-#  define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
-#  define BOOST_NO_CXX11_EXTERN_TEMPLATE
-#  define BOOST_NO_CXX11_RVALUE_REFERENCES 
-#  define BOOST_NO_CXX11_SCOPED_ENUMS
-#  define BOOST_NO_CXX11_STATIC_ASSERT
+#  define BOOST_NO_CHAR16_T
+#  define BOOST_NO_CHAR32_T
+#  define BOOST_NO_DECLTYPE
+#  define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#  define BOOST_NO_EXTERN_TEMPLATE
+#  define BOOST_NO_RVALUE_REFERENCES 
+#  define BOOST_NO_SCOPED_ENUMS
+#  define BOOST_NO_STATIC_ASSERT
 #else
 #  define BOOST_HAS_ALIGNOF
 #  define BOOST_HAS_CHAR16_T
@@ -169,28 +169,24 @@
 #  define BOOST_HAS_STATIC_ASSERT
 #endif

-#define BOOST_NO_CXX11_AUTO_DECLARATIONS
-#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CXX11_CONSTEXPR
-#define BOOST_NO_CXX11_DECLTYPE_N3276
-#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#define BOOST_NO_CXX11_DELETED_FUNCTIONS
-#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#define BOOST_NO_CXX11_LAMBDAS
-#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_CXX11_NULLPTR
-#define BOOST_NO_CXX11_RANGE_BASED_FOR
-#define BOOST_NO_CXX11_RAW_LITERALS
-#define BOOST_NO_CXX11_RVALUE_REFERENCES
-#define BOOST_NO_CXX11_SCOPED_ENUMS
+#define BOOST_NO_AUTO_DECLARATIONS
+#define BOOST_NO_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CONSTEXPR
+#define BOOST_NO_DEFAULTED_FUNCTIONS
+#define BOOST_NO_DELETED_FUNCTIONS
+#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_SFINAE_EXPR
-#define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#define BOOST_NO_CXX11_UNICODE_LITERALS    // UTF-8 still not supported
-#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#define BOOST_NO_CXX11_NOEXCEPT
-#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
-#define BOOST_NO_CXX11_USER_DEFINED_LITERALS
+#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
--- a/include/boost/config/compiler/clang.hpp
+++ b/include/boost/config/compiler/clang.hpp
@@ -8,142 +8,69 @@

 // Clang compiler setup.

-#if !__has_feature(cxx_exceptions) && !defined(BOOST_NO_EXCEPTIONS)
+#if __has_feature(cxx_exceptions) && !defined(BOOST_NO_EXCEPTIONS)
+#else
 #  define BOOST_NO_EXCEPTIONS
 #endif

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

-#if !__has_feature(cxx_rtti) && !defined(BOOST_NO_TYPEID)
-#  define BOOST_NO_TYPEID
-#endif
-
-#if defined(__int64) && !defined(__GNUC__)
+#if defined(__int64)
 #  define BOOST_HAS_MS_INT64
 #endif

 #define BOOST_HAS_NRVO

 // Clang supports "long long" in all compilation modes.
-#define BOOST_HAS_LONG_LONG

-//
-// Dynamic shared object (DSO) and dynamic-link library (DLL) support
-//
-#if !defined(_WIN32) && !defined(__WIN32__) && !defined(WIN32)
-#  define BOOST_SYMBOL_EXPORT __attribute__((__visibility__("default")))
-#  define BOOST_SYMBOL_IMPORT
-#  define BOOST_SYMBOL_VISIBLE __attribute__((__visibility__("default")))
-#endif
-
-// 
-// The BOOST_FALLTHROUGH macro can be used to annotate implicit fall-through 
-// between switch labels. 
-// 
-#if __cplusplus >= 201103L && defined(__has_warning) 
-#  if __has_feature(cxx_attributes) && __has_warning("-Wimplicit-fallthrough") 
-#    define BOOST_FALLTHROUGH [[clang::fallthrough]] 
-#  endif 
-#endif 
-
-#if !__has_feature(cxx_auto_type)
-#  define BOOST_NO_CXX11_AUTO_DECLARATIONS
-#  define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-#endif
-
-#if !(defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L)
-#  define BOOST_NO_CXX11_CHAR16_T
-#  define BOOST_NO_CXX11_CHAR32_T
-#endif
-
-#if !__has_feature(cxx_constexpr)
-#  define BOOST_NO_CXX11_CONSTEXPR
-#endif
+#define BOOST_NO_AUTO_DECLARATIONS
+#define BOOST_NO_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CHAR16_T
+#define BOOST_NO_CHAR32_T
+#define BOOST_NO_CONSTEXPR

 #if !__has_feature(cxx_decltype)
-#  define BOOST_NO_CXX11_DECLTYPE
+#  define BOOST_NO_DECLTYPE
 #endif

-#if !__has_feature(cxx_decltype_incomplete_return_types)
-#  define BOOST_NO_CXX11_DECLTYPE_N3276
-#endif
-
-#if !__has_feature(cxx_defaulted_functions)
-#  define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#endif
+#define BOOST_NO_DEFAULTED_FUNCTIONS

 #if !__has_feature(cxx_deleted_functions)
-#  define BOOST_NO_CXX11_DELETED_FUNCTIONS
+#  define BOOST_NO_DELETED_FUNCTIONS
 #endif

-#if !__has_feature(cxx_explicit_conversions)
-#  define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
-#endif
+#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS

 #if !__has_feature(cxx_default_function_template_args)
-#  define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
+  #define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #endif

-#if !__has_feature(cxx_generalized_initializers)
-#  define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#endif
-
-#if !__has_feature(cxx_lambdas)
-#  define BOOST_NO_CXX11_LAMBDAS
-#endif
-
-#if !__has_feature(cxx_local_type_template_args)
-#  define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#endif
-
-#if !__has_feature(cxx_noexcept)
-#  define BOOST_NO_CXX11_NOEXCEPT
-#endif
-
-#if !__has_feature(cxx_nullptr)
-#  define BOOST_NO_CXX11_NULLPTR
-#endif
-
-#if !__has_feature(cxx_range_for)
-#  define BOOST_NO_CXX11_RANGE_BASED_FOR
-#endif
-
-#if !__has_feature(cxx_raw_string_literals)
-#  define BOOST_NO_CXX11_RAW_LITERALS
-#endif
-
-#if !__has_feature(cxx_generalized_initializers)
-#  define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
-#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_UNIFIED_INITIALIZATION_SYNTAX

 #if !__has_feature(cxx_rvalue_references)
-#  define BOOST_NO_CXX11_RVALUE_REFERENCES
+#  define BOOST_NO_RVALUE_REFERENCES
 #endif

 #if !__has_feature(cxx_strong_enums)
-#  define BOOST_NO_CXX11_SCOPED_ENUMS
+#  define BOOST_NO_SCOPED_ENUMS
 #endif

 #if !__has_feature(cxx_static_assert)
-#  define BOOST_NO_CXX11_STATIC_ASSERT
+#  define BOOST_NO_STATIC_ASSERT
 #endif

-#if !__has_feature(cxx_alias_templates)
-#  define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#endif
-
-#if !__has_feature(cxx_unicode_literals)
-#  define BOOST_NO_CXX11_UNICODE_LITERALS
-#endif
+#define BOOST_NO_TEMPLATE_ALIASES
+#define BOOST_NO_UNICODE_LITERALS

 #if !__has_feature(cxx_variadic_templates)
-#  define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#endif
-
-#if !__has_feature(cxx_user_literals)
-#  define BOOST_NO_CXX11_USER_DEFINED_LITERALS
+#  define BOOST_NO_VARIADIC_TEMPLATES
 #endif

 // Clang always supports variadic macros
--- a/include/boost/config/compiler/codegear.hpp
+++ b/include/boost/config/compiler/codegear.hpp
@@ -76,7 +76,7 @@
 // C++0x macros:
 //
 #if (__CODEGEARC__ <= 0x620)
-#define BOOST_NO_CXX11_STATIC_ASSERT
+#define BOOST_NO_STATIC_ASSERT
 #else
 #define BOOST_HAS_STATIC_ASSERT
 #endif
@@ -91,26 +91,24 @@
 // #define BOOST_HAS_STATIC_ASSERT
 #define BOOST_HAS_STD_TYPE_TRAITS

-#define BOOST_NO_CXX11_AUTO_DECLARATIONS
-#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CXX11_CONSTEXPR
-#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#define BOOST_NO_CXX11_DELETED_FUNCTIONS
-#define BOOST_NO_CXX11_EXTERN_TEMPLATE
-#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_CXX11_LAMBDAS
-#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_CXX11_NOEXCEPT
-#define BOOST_NO_CXX11_NULLPTR
-#define BOOST_NO_CXX11_RANGE_BASED_FOR
-#define BOOST_NO_CXX11_RAW_LITERALS
-#define BOOST_NO_CXX11_RVALUE_REFERENCES
+#define BOOST_NO_AUTO_DECLARATIONS
+#define BOOST_NO_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CONSTEXPR
+#define BOOST_NO_DEFAULTED_FUNCTIONS
+#define BOOST_NO_DELETED_FUNCTIONS
+#define BOOST_NO_EXTERN_TEMPLATE
+#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
 #define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#define BOOST_NO_CXX11_UNICODE_LITERALS
-#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
-#define BOOST_NO_CXX11_USER_DEFINED_LITERALS
+#define BOOST_NO_TEMPLATE_ALIASES
+#define BOOST_NO_UNICODE_LITERALS
+#define BOOST_NO_VARIADIC_TEMPLATES
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX

 //
 // TR1 macros:
@@ -122,7 +120,7 @@

 #define BOOST_HAS_MACRO_USE_FACET

-#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
+#define BOOST_NO_INITIALIZER_LISTS

 // On non-Win32 platforms let the platform config figure this out:
 #ifdef _WIN32
--- a/include/boost/config/compiler/common_edg.hpp
+++ b/include/boost/config/compiler/common_edg.hpp
@@ -60,42 +60,38 @@
 //   See above for BOOST_NO_LONG_LONG
 //
 #if (__EDG_VERSION__ < 310)
-#  define BOOST_NO_CXX11_EXTERN_TEMPLATE
+#  define BOOST_NO_EXTERN_TEMPLATE
 #endif
 #if (__EDG_VERSION__ <= 310)
 // No support for initializer lists
-#  define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
+#  define BOOST_NO_INITIALIZER_LISTS
 #endif
 #if (__EDG_VERSION__ < 400)
-#  define BOOST_NO_CXX11_VARIADIC_MACROS
+#  define BOOST_NO_VARIADIC_MACROS
 #endif

-#define BOOST_NO_CXX11_AUTO_DECLARATIONS
-#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CXX11_CHAR16_T
-#define BOOST_NO_CXX11_CHAR32_T
-#define BOOST_NO_CXX11_CONSTEXPR
-#define BOOST_NO_CXX11_DECLTYPE
-#define BOOST_NO_CXX11_DECLTYPE_N3276
-#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#define BOOST_NO_CXX11_DELETED_FUNCTIONS
-#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_CXX11_LAMBDAS
-#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_CXX11_NOEXCEPT
-#define BOOST_NO_CXX11_NULLPTR
-#define BOOST_NO_CXX11_RANGE_BASED_FOR
-#define BOOST_NO_CXX11_RAW_LITERALS
-#define BOOST_NO_CXX11_RVALUE_REFERENCES
-#define BOOST_NO_CXX11_SCOPED_ENUMS
+#define BOOST_NO_AUTO_DECLARATIONS
+#define BOOST_NO_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CHAR16_T
+#define BOOST_NO_CHAR32_T
+#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_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_CXX11_STATIC_ASSERT
-#define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#define BOOST_NO_CXX11_UNICODE_LITERALS
-#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
-#define BOOST_NO_CXX11_USER_DEFINED_LITERALS
+#define BOOST_NO_STATIC_ASSERT
+#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
@@ -1,64 +0,0 @@
-//  (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_CXX11_AUTO_DECLARATIONS
-#undef BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-#define BOOST_HAS_NRVO
-#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
-#define BOOST_NO_CXX11_UNICODE_LITERALS
-#define BOOST_NO_TWO_PHASE_NAME_LOOKUP
-#define BOOST_HAS_NRVO
-#define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#define BOOST_NO_CXX11_STATIC_ASSERT
-#define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_CXX11_SCOPED_ENUMS
-#define BOOST_NO_CXX11_RVALUE_REFERENCES
-#define BOOST_NO_CXX11_RANGE_BASED_FOR
-#define BOOST_NO_CXX11_RAW_LITERALS
-#define BOOST_NO_CXX11_NULLPTR
-#define BOOST_NO_CXX11_NOEXCEPT
-#define BOOST_NO_CXX11_LAMBDAS
-#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_CXX11_DELETED_FUNCTIONS
-#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#define BOOST_NO_CXX11_DECLTYPE_N3276
-#define BOOST_NO_CXX11_DECLTYPE
-#define BOOST_NO_CXX11_CONSTEXPR
-#define BOOST_NO_CXX11_USER_DEFINED_LITERALS
-#define BOOST_NO_COMPLETE_VALUE_INITIALIZATION
-#define BOOST_NO_CXX11_CHAR32_T
-#define BOOST_NO_CXX11_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
@@ -60,36 +60,32 @@
 //
 // C++0x features
 //
-#define BOOST_NO_CXX11_AUTO_DECLARATIONS
-#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CXX11_CHAR16_T
-#define BOOST_NO_CXX11_CHAR32_T
-#define BOOST_NO_CXX11_CONSTEXPR
-#define BOOST_NO_CXX11_DECLTYPE
-#define BOOST_NO_CXX11_DECLTYPE_N3276
-#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#define BOOST_NO_CXX11_DELETED_FUNCTIONS
-#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_CXX11_EXTERN_TEMPLATE
-#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#define BOOST_NO_CXX11_LAMBDAS
-#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_CXX11_NOEXCEPT
-#define BOOST_NO_CXX11_NULLPTR
-#define BOOST_NO_CXX11_RANGE_BASED_FOR
-#define BOOST_NO_CXX11_RAW_LITERALS
-#define BOOST_NO_CXX11_RVALUE_REFERENCES
-#define BOOST_NO_CXX11_SCOPED_ENUMS
+#define BOOST_NO_AUTO_DECLARATIONS
+#define BOOST_NO_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CHAR16_T
+#define BOOST_NO_CHAR32_T
+#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_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
+#define BOOST_NO_SCOPED_ENUMS
 #define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_CXX11_STATIC_ASSERT
-#define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#define BOOST_NO_CXX11_UNICODE_LITERALS
-#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
-#define BOOST_NO_CXX11_USER_DEFINED_LITERALS
+#define BOOST_NO_STATIC_ASSERT
+#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_CXX11_VARIADIC_MACROS
+#define BOOST_NO_VARIADIC_MACROS
 #endif

 #if __DMC__ < 0x800
--- a/include/boost/config/compiler/gcc.hpp
+++ b/include/boost/config/compiler/gcc.hpp
@@ -11,14 +11,7 @@

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

-//  GNU C++ compiler setup.
-
-//
-// Define BOOST_GCC so we know this is "real" GCC and not some pretender:
-//
-#if !defined(__CUDACC__)
-#define BOOST_GCC (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-#endif
+//  GNU C++ compiler setup:

 #if __GNUC__ < 3
 #   if __GNUC_MINOR__ == 91
@@ -49,9 +42,9 @@
 #   define BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE
 #   define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
 #   define BOOST_NO_IS_ABSTRACT
-#   define BOOST_NO_CXX11_EXTERN_TEMPLATE
+#   define BOOST_NO_EXTERN_TEMPLATE
 // Variadic macros do not exist for gcc versions before 3.0
-#   define BOOST_NO_CXX11_VARIADIC_MACROS
+#   define BOOST_NO_VARIADIC_MACROS
 #elif __GNUC__ == 3
 #  if defined (__PATHSCALE__)
 #     define BOOST_NO_TWO_PHASE_NAME_LOOKUP
@@ -68,7 +61,7 @@
 #  if __GNUC_MINOR__ < 4
 #     define BOOST_NO_IS_ABSTRACT
 #  endif
-#  define BOOST_NO_CXX11_EXTERN_TEMPLATE
+#  define BOOST_NO_EXTERN_TEMPLATE
 #endif
 #if __GNUC__ < 4
 //
@@ -153,19 +146,9 @@
 #  endif
 #endif

+// C++0x features not implemented in any GCC version
 //
-// Recent GCC versions have __int128 when in 64-bit mode.
-//
-// We disable this if the compiler is really nvcc as it
-// doesn't actually support __int128 as of CUDA_VERSION=5000
-// even though it defines __SIZEOF_INT128__.  
-// See https://svn.boost.org/trac/boost/ticket/8048
-// Only re-enable this for nvcc if you're absolutely sure
-// of the circumstances under which it's supported:
-//
-#if defined(__SIZEOF_INT128__) && !defined(__CUDACC__)
-#  define BOOST_HAS_INT128
-#endif
+#define BOOST_NO_TEMPLATE_ALIASES

 // C++0x features in 4.3.n and later
 //
@@ -178,75 +161,60 @@
 #  define BOOST_HAS_STATIC_ASSERT
 #  define BOOST_HAS_VARIADIC_TMPL
 #else
-#  define BOOST_NO_CXX11_DECLTYPE
-#  define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#  define BOOST_NO_CXX11_RVALUE_REFERENCES
-#  define BOOST_NO_CXX11_STATIC_ASSERT
+#  define BOOST_NO_DECLTYPE
+#  define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#  define BOOST_NO_RVALUE_REFERENCES
+#  define BOOST_NO_STATIC_ASSERT

 // Variadic templates compiler: 
 //   http://www.generic-programming.org/~dgregor/cpp/variadic-templates.html
 #  if defined(__VARIADIC_TEMPLATES) || (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4) && defined(__GXX_EXPERIMENTAL_CXX0X__))
 #    define BOOST_HAS_VARIADIC_TMPL
 #  else
-#    define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+#    define BOOST_NO_VARIADIC_TEMPLATES
 #  endif
 #endif

 // C++0x features in 4.4.n and later
 //
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
-#  define BOOST_NO_CXX11_AUTO_DECLARATIONS
-#  define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-#  define BOOST_NO_CXX11_CHAR16_T
-#  define BOOST_NO_CXX11_CHAR32_T
-#  define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#  define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#  define BOOST_NO_CXX11_DELETED_FUNCTIONS
+#  define BOOST_NO_AUTO_DECLARATIONS
+#  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
 #endif

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

 // C++0x features in 4.5.0 and later
 //
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
-#  define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
-#  define BOOST_NO_CXX11_LAMBDAS
-#  define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#  define BOOST_NO_CXX11_RAW_LITERALS
-#  define BOOST_NO_CXX11_UNICODE_LITERALS
+#  define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#  define BOOST_NO_LAMBDAS
+#  define BOOST_NO_RAW_LITERALS
+#  define BOOST_NO_UNICODE_LITERALS
 #endif

 // 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_CXX11_SCOPED_ENUMS before 4.5.1
+// 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_CXX11_SCOPED_ENUMS
+#  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_CXX11_CONSTEXPR
-#define BOOST_NO_CXX11_NOEXCEPT
-#define BOOST_NO_CXX11_NULLPTR
-#define BOOST_NO_CXX11_RANGE_BASED_FOR
-#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
-#endif
-
-// C++0x features in 4.7.n and later
-//
-#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
-#  define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#  define BOOST_NO_CXX11_USER_DEFINED_LITERALS
-#endif
-
-// C++0x features in 4.8.1 and later
-//
-#if (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__ < 40801) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
-#  define BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_NO_CONSTEXPR
+#define BOOST_NO_NOEXCEPT
+#define BOOST_NO_NULLPTR
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
 #endif

 #ifndef BOOST_COMPILER
--- a/include/boost/config/compiler/gcc_xml.hpp
+++ b/include/boost/config/compiler/gcc_xml.hpp
@@ -27,34 +27,31 @@

 // C++0x features:
 //
-#  define BOOST_NO_CXX11_CONSTEXPR
-#  define BOOST_NO_CXX11_NULLPTR
-#  define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#  define BOOST_NO_CXX11_DECLTYPE
-#  define BOOST_NO_CXX11_DECLTYPE_N3276
-#  define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#  define BOOST_NO_CXX11_RVALUE_REFERENCES
-#  define BOOST_NO_CXX11_STATIC_ASSERT
-#  define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#  define BOOST_NO_CXX11_VARIADIC_MACROS
-#  define BOOST_NO_CXX11_AUTO_DECLARATIONS
-#  define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-#  define BOOST_NO_CXX11_CHAR16_T
-#  define BOOST_NO_CXX11_CHAR32_T
-#  define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#  define BOOST_NO_CXX11_DELETED_FUNCTIONS
-#  define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#  define BOOST_NO_CXX11_SCOPED_ENUMS  
+#  define BOOST_NO_CONSTEXPR
+#  define BOOST_NO_NULLPTR
+#  define BOOST_NO_TEMPLATE_ALIASES
+#  define BOOST_NO_DECLTYPE
+#  define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#  define BOOST_NO_RVALUE_REFERENCES
+#  define BOOST_NO_STATIC_ASSERT
+#  define BOOST_NO_VARIADIC_TEMPLATES
+#  define BOOST_NO_VARIADIC_MACROS
+#  define BOOST_NO_AUTO_DECLARATIONS
+#  define BOOST_NO_AUTO_MULTIDECLARATIONS
+#  define BOOST_NO_CHAR16_T
+#  define BOOST_NO_CHAR32_T
+#  define BOOST_NO_DEFAULTED_FUNCTIONS
+#  define BOOST_NO_DELETED_FUNCTIONS
+#  define BOOST_NO_INITIALIZER_LISTS
+#  define BOOST_NO_SCOPED_ENUMS  
 #  define BOOST_NO_SFINAE_EXPR
-#  define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
-#  define BOOST_NO_CXX11_LAMBDAS
-#  define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#  define BOOST_NO_CXX11_RANGE_BASED_FOR
-#  define BOOST_NO_CXX11_RAW_LITERALS
-#  define BOOST_NO_CXX11_UNICODE_LITERALS
-#  define BOOST_NO_CXX11_NOEXCEPT
-#  define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
-#  define BOOST_NO_CXX11_USER_DEFINED_LITERALS
+#  define BOOST_NO_SCOPED_ENUMS
+#  define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#  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
@@ -92,33 +92,29 @@
 //
 #if !defined(__EDG__)

-#define BOOST_NO_CXX11_AUTO_DECLARATIONS
-#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CXX11_CHAR16_T
-#define BOOST_NO_CXX11_CHAR32_T
-#define BOOST_NO_CXX11_CONSTEXPR
-#define BOOST_NO_CXX11_DECLTYPE
-#define BOOST_NO_CXX11_DECLTYPE_N3276
-#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#define BOOST_NO_CXX11_DELETED_FUNCTIONS
-#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_CXX11_EXTERN_TEMPLATE
-#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#define BOOST_NO_CXX11_LAMBDAS
-#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_CXX11_NOEXCEPT
-#define BOOST_NO_CXX11_NULLPTR
-#define BOOST_NO_CXX11_RANGE_BASED_FOR
-#define BOOST_NO_CXX11_RAW_LITERALS
-#define BOOST_NO_CXX11_RVALUE_REFERENCES
-#define BOOST_NO_CXX11_SCOPED_ENUMS
+#define BOOST_NO_AUTO_DECLARATIONS
+#define BOOST_NO_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CHAR16_T
+#define BOOST_NO_CHAR32_T
+#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_EXTERN_TEMPLATE
+#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
+#define BOOST_NO_SCOPED_ENUMS
 #define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_CXX11_STATIC_ASSERT
-#define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#define BOOST_NO_CXX11_UNICODE_LITERALS
-#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#define BOOST_NO_CXX11_USER_DEFINED_LITERALS
+#define BOOST_NO_STATIC_ASSERT
+#define BOOST_NO_TEMPLATE_ALIASES
+#define BOOST_NO_UNICODE_LITERALS
+#define BOOST_NO_VARIADIC_TEMPLATES

 /* 
  See https://forums13.itrc.hp.com/service/forums/questionanswer.do?threadId=1443331 and
@@ -126,7 +122,7 @@
 */

 #if (__HP_aCC < 62500) || !defined(HP_CXX0x_SOURCE)
-  #define BOOST_NO_CXX11_VARIADIC_MACROS
+  #define BOOST_NO_VARIADIC_MACROS
 #endif

 #endif
--- a/include/boost/config/compiler/intel.hpp
+++ b/include/boost/config/compiler/intel.hpp
@@ -27,7 +27,7 @@
 #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__)
+#if (!(defined(_WIN32) || defined(_WIN64)) && defined(__STDC_HOSTED__) && __STDC_HOSTED__) || defined(__GXX_EXPERIMENTAL_CPP0X__)
 #  define BOOST_INTEL_STDCXX0X
 #endif
 #if defined(_MSC_VER) && (_MSC_VER >= 1600)
@@ -179,9 +179,8 @@ 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) || (__INTEL_COMPILER == 9999) || (defined(_WIN32) && (__INTEL_COMPILER < 1500))
+#  if __INTEL_COMPILER <= 1110
 #    define BOOST_NO_COMPLETE_VALUE_INITIALIZATION
 #  endif
 #endif
@@ -199,54 +198,26 @@ template<> struct assert_intrinsic_wchar_t<unsigned short> {};
 //     - ICC added static_assert in 11.0 (first version with C++0x support)
 //
 #if defined(BOOST_INTEL_STDCXX0X)
-#  undef  BOOST_NO_CXX11_STATIC_ASSERT
+#  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_CXX11_LAMBDAS
-//#  undef  BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
-//#  undef  BOOST_NO_CXX11_DECLTYPE
-//#  undef  BOOST_NO_CXX11_AUTO_DECLARATIONS
-//#  undef  BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+//#  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_CXX11_RVALUE_REFERENCES // Enabling this breaks Filesystem and Exception libraries
-//#  undef  BOOST_NO_CXX11_SCOPED_ENUMS  // doesn't really work!!
-#  undef  BOOST_NO_CXX11_DELETED_FUNCTIONS
-#  undef  BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#  undef  BOOST_NO_CXX11_LAMBDAS
-#  undef  BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#  undef  BOOST_NO_CXX11_DECLTYPE
-#  undef  BOOST_NO_CXX11_AUTO_DECLARATIONS
-#  undef  BOOST_NO_CXX11_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_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#  undef  BOOST_NO_CXX11_NULLPTR
-#  undef  BOOST_NO_CXX11_RVALUE_REFERENCES
-#  undef  BOOST_NO_SFINAE_EXPR
-#  undef  BOOST_NO_CXX11_TEMPLATE_ALIASES
-#  undef  BOOST_NO_CXX11_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_CXX11_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_CXX11_HDR_INITIALIZER_LIST
-#  define  BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#  define  BOOST_NO_CXX11_DELETED_FUNCTIONS
-#  define  BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#  define  BOOST_NO_CXX11_TEMPLATE_ALIASES
+#  undef  BOOST_NO_RVALUE_REFERENCES
+//#  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

 #if (BOOST_INTEL_CXX_VERSION < 1200)
--- a/include/boost/config/compiler/metrowerks.hpp
+++ b/include/boost/config/compiler/metrowerks.hpp
@@ -90,36 +90,32 @@
 #if __MWERKS__ > 0x3206 && __option(rvalue_refs)
 #  define BOOST_HAS_RVALUE_REFS
 #else
-#  define BOOST_NO_CXX11_RVALUE_REFERENCES              
+#  define BOOST_NO_RVALUE_REFERENCES              
 #endif
-#define BOOST_NO_CXX11_AUTO_DECLARATIONS
-#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CXX11_CHAR16_T
-#define BOOST_NO_CXX11_CHAR32_T
-#define BOOST_NO_CXX11_CONSTEXPR
-#define BOOST_NO_CXX11_DECLTYPE
-#define BOOST_NO_CXX11_DECLTYPE_N3276
-#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#define BOOST_NO_CXX11_DELETED_FUNCTIONS
-#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_CXX11_EXTERN_TEMPLATE
-#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#define BOOST_NO_CXX11_LAMBDAS
-#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_CXX11_NOEXCEPT
-#define BOOST_NO_CXX11_NULLPTR
-#define BOOST_NO_CXX11_RANGE_BASED_FOR
-#define BOOST_NO_CXX11_RAW_LITERALS
-#define BOOST_NO_CXX11_SCOPED_ENUMS
+#define BOOST_NO_AUTO_DECLARATIONS
+#define BOOST_NO_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CHAR16_T
+#define BOOST_NO_CHAR32_T
+#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_EXTERN_TEMPLATE
+#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
 #define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_CXX11_STATIC_ASSERT
-#define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#define BOOST_NO_CXX11_UNICODE_LITERALS
-#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#define BOOST_NO_CXX11_VARIADIC_MACROS
-#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
-#define BOOST_NO_CXX11_USER_DEFINED_LITERALS
+#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
+#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
@@ -40,35 +40,31 @@
 //
 //   See boost\config\suffix.hpp for BOOST_NO_LONG_LONG
 //
-#define BOOST_NO_CXX11_AUTO_DECLARATIONS
-#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CXX11_CHAR16_T
-#define BOOST_NO_CXX11_CHAR32_T
-#define BOOST_NO_CXX11_CONSTEXPR
-#define BOOST_NO_CXX11_DECLTYPE
-#define BOOST_NO_CXX11_DECLTYPE_N3276
-#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#define BOOST_NO_CXX11_DELETED_FUNCTIONS
-#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_CXX11_EXTERN_TEMPLATE
-#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#define BOOST_NO_CXX11_LAMBDAS
-#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_CXX11_NOEXCEPT
-#define BOOST_NO_CXX11_NULLPTR
-#define BOOST_NO_CXX11_RANGE_BASED_FOR
-#define BOOST_NO_CXX11_RAW_LITERALS
-#define BOOST_NO_CXX11_RVALUE_REFERENCES
-#define BOOST_NO_CXX11_SCOPED_ENUMS
+#define BOOST_NO_AUTO_DECLARATIONS
+#define BOOST_NO_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CHAR16_T
+#define BOOST_NO_CHAR32_T
+#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_EXTERN_TEMPLATE
+#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
+#define BOOST_NO_SCOPED_ENUMS
 #define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_CXX11_STATIC_ASSERT
-#define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#define BOOST_NO_CXX11_UNICODE_LITERALS
-#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#define BOOST_NO_CXX11_VARIADIC_MACROS
-#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
-#define BOOST_NO_CXX11_USER_DEFINED_LITERALS
+#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
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX

 //
 // versions check:
--- a/include/boost/config/compiler/pathscale.hpp
+++ b/include/boost/config/compiler/pathscale.hpp
@@ -32,50 +32,48 @@
 #  define BOOST_HAS_EXPM1
 #  define BOOST_HAS_DIRENT_H
 #  define BOOST_HAS_CLOCK_GETTIME
-#  define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#  define BOOST_NO_CXX11_UNICODE_LITERALS
-#  define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#  define BOOST_NO_CXX11_STATIC_ASSERT
+#  define BOOST_NO_VARIADIC_TEMPLATES
+#  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_CXX11_SCOPED_ENUMS
-#  define BOOST_NO_CXX11_RVALUE_REFERENCES
-#  define BOOST_NO_CXX11_RANGE_BASED_FOR
-#  define BOOST_NO_CXX11_RAW_LITERALS
-#  define BOOST_NO_CXX11_NULLPTR
-#  define BOOST_NO_CXX11_NUMERIC_LIMITS
-#  define BOOST_NO_CXX11_NOEXCEPT
-#  define BOOST_NO_CXX11_LAMBDAS
-#  define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#  define BOOST_NO_SCOPED_ENUMS
+#  define BOOST_NO_RVALUE_REFERENCES
+#  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
-#  define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#  define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
-#  define BOOST_NO_CXX11_DELETED_FUNCTIONS
-#  define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#  define BOOST_NO_CXX11_DECLTYPE
-#  define BOOST_NO_CXX11_DECLTYPE_N3276
-#  define BOOST_NO_CXX11_CONSTEXPR
+#  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
+#  define BOOST_NO_CONSTEXPR
 #  define BOOST_NO_COMPLETE_VALUE_INITIALIZATION
-#  define BOOST_NO_CXX11_CHAR32_T
-#  define BOOST_NO_CXX11_CHAR16_T
-#  define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-#  define BOOST_NO_CXX11_AUTO_DECLARATIONS
-#  define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
-#  define BOOST_NO_CXX11_HDR_UNORDERED_SET
-#  define BOOST_NO_CXX11_HDR_UNORDERED_MAP
-#  define BOOST_NO_CXX11_HDR_TYPEINDEX
-#  define BOOST_NO_CXX11_HDR_TUPLE
-#  define BOOST_NO_CXX11_HDR_THREAD
-#  define BOOST_NO_CXX11_HDR_SYSTEM_ERROR
-#  define BOOST_NO_CXX11_HDR_REGEX
-#  define BOOST_NO_CXX11_HDR_RATIO
-#  define BOOST_NO_CXX11_HDR_RANDOM
-#  define BOOST_NO_CXX11_HDR_MUTEX
-#  define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#  define BOOST_NO_CXX11_HDR_FUTURE
-#  define BOOST_NO_CXX11_HDR_FORWARD_LIST
-#  define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_CXX11_HDR_CODECVT
-#  define BOOST_NO_CXX11_HDR_CHRONO
-#  define BOOST_NO_CXX11_USER_DEFINED_LITERALS
+#  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
+#  define BOOST_NO_0X_HDR_TUPLE
+#  define BOOST_NO_0X_HDR_THREAD
+#  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_INITIALIZER_LIST
+#  define BOOST_NO_0X_HDR_FUTURE
+#  define BOOST_NO_0X_HDR_FORWARD_LIST
+#  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  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
@@ -1,6 +1,6 @@
 //  (C) Copyright Noel Belcourt 2007.
-//  Use, modification and distribution are subject to the
-//  Boost Software License, Version 1.0. (See accompanying file
+//  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.
@@ -8,7 +8,7 @@
 //  PGI C++ compiler setup:

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

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

-#if __PGIC__ >= 11
+// 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
 #define BOOST_HAS_PTHREADS
-#define BOOST_HAS_THREADS
-#define BOOST_HAS_PTHREAD_YIELD
-#define BOOST_HAS_NRVO
-#define BOOST_HAS_LONG_LONG
-
-// options --enable-test wants undefined
-#undef BOOST_NO_STDC_NAMESPACE
-#undef BOOST_NO_EXCEPTION_STD_NAMESPACE
-#undef BOOST_DEDUCED_TYPENAME
-
-#define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
-#define BOOST_NO_TWO_PHASE_NAME_LOOKUP
-#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CXX11_AUTO_DECLARATIONS
-
-#elif __PGIC__ >= 10
-
-// options requested by configure --enable-test
-#define BOOST_HAS_THREADS
 #define BOOST_HAS_NRVO
 #define BOOST_HAS_LONG_LONG

@@ -49,11 +33,11 @@

 #elif __PGIC__ >= 7

-#define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
+#define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL 
 #define BOOST_NO_TWO_PHASE_NAME_LOOKUP
 #define BOOST_NO_SWPRINTF
-#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CXX11_AUTO_DECLARATIONS
+#define BOOST_NO_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_AUTO_DECLARATIONS

 #else

@@ -65,53 +49,29 @@
 //
 //   See boost\config\suffix.hpp for BOOST_NO_LONG_LONG
 //
-#define BOOST_NO_CXX11_CHAR16_T
-#define BOOST_NO_CXX11_CHAR32_T
-#define BOOST_NO_CXX11_CONSTEXPR
-#define BOOST_NO_CXX11_DECLTYPE
-#define BOOST_NO_CXX11_DECLTYPE_N3276
-#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#define BOOST_NO_CXX11_DELETED_FUNCTIONS
-#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_CXX11_EXTERN_TEMPLATE
-#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_CXX11_LAMBDAS
-#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_CXX11_NOEXCEPT
-#define BOOST_NO_CXX11_NULLPTR
-#define BOOST_NO_CXX11_NUMERIC_LIMITS
-#define BOOST_NO_CXX11_RANGE_BASED_FOR
-#define BOOST_NO_CXX11_RAW_LITERALS
-#define BOOST_NO_CXX11_RVALUE_REFERENCES
-#define BOOST_NO_CXX11_SCOPED_ENUMS
+#define BOOST_NO_CHAR16_T
+#define BOOST_NO_CHAR32_T
+#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_EXTERN_TEMPLATE
+#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
+#define BOOST_NO_SCOPED_ENUMS
 #define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_CXX11_STATIC_ASSERT
-#define BOOST_NO_SWPRINTF
-#define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#define BOOST_NO_CXX11_UNICODE_LITERALS
-#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#define BOOST_NO_CXX11_VARIADIC_MACROS
-#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
-
-#define BOOST_NO_CXX11_HDR_UNORDERED_SET
-#define BOOST_NO_CXX11_HDR_UNORDERED_MAP
-#define BOOST_NO_CXX11_HDR_TYPEINDEX
-#define BOOST_NO_CXX11_HDR_TYPE_TRAITS
-#define BOOST_NO_CXX11_HDR_TUPLE
-#define BOOST_NO_CXX11_HDR_THREAD
-#define BOOST_NO_CXX11_HDR_SYSTEM_ERROR
-#define BOOST_NO_CXX11_HDR_REGEX
-#define BOOST_NO_CXX11_HDR_RATIO
-#define BOOST_NO_CXX11_HDR_RANDOM
-#define BOOST_NO_CXX11_HDR_MUTEX
-#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#define BOOST_NO_CXX11_HDR_FUTURE
-#define BOOST_NO_CXX11_HDR_FORWARD_LIST
-#define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE
-#define BOOST_NO_CXX11_HDR_CODECVT
-#define BOOST_NO_CXX11_HDR_CHRONO
-#define BOOST_NO_CXX11_HDR_ARRAY
-#define BOOST_NO_CXX11_USER_DEFINED_LITERALS
+#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
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX

 //
 // version check:
--- a/include/boost/config/compiler/sunpro_cc.hpp
+++ b/include/boost/config/compiler/sunpro_cc.hpp
@@ -99,35 +99,31 @@
 //
 #  define BOOST_HAS_LONG_LONG

-#define BOOST_NO_CXX11_AUTO_DECLARATIONS
-#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CXX11_CHAR16_T
-#define BOOST_NO_CXX11_CHAR32_T
-#define BOOST_NO_CXX11_CONSTEXPR
-#define BOOST_NO_CXX11_DECLTYPE
-#define BOOST_NO_CXX11_DECLTYPE_N3276
-#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#define BOOST_NO_CXX11_DELETED_FUNCTIONS
-#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_CXX11_EXTERN_TEMPLATE
-#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#define BOOST_NO_CXX11_LAMBDAS
-#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_CXX11_NOEXCEPT
-#define BOOST_NO_CXX11_NULLPTR
-#define BOOST_NO_CXX11_RANGE_BASED_FOR
-#define BOOST_NO_CXX11_RAW_LITERALS
-#define BOOST_NO_CXX11_RVALUE_REFERENCES
-#define BOOST_NO_CXX11_SCOPED_ENUMS
+#define BOOST_NO_AUTO_DECLARATIONS
+#define BOOST_NO_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CHAR16_T
+#define BOOST_NO_CHAR32_T
+#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_EXTERN_TEMPLATE
+#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
+#define BOOST_NO_SCOPED_ENUMS
 #define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_CXX11_STATIC_ASSERT
-#define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#define BOOST_NO_CXX11_UNICODE_LITERALS
-#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#define BOOST_NO_CXX11_VARIADIC_MACROS
-#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
-#define BOOST_NO_CXX11_USER_DEFINED_LITERALS
+#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
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX

 //
 // Version
--- a/include/boost/config/compiler/vacpp.hpp
+++ b/include/boost/config/compiler/vacpp.hpp
@@ -53,8 +53,8 @@
 #error "Compiler not supported or configured - please reconfigure"
 #endif
 //
-// last known and checked version is 1210:
-#if (__IBMCPP__ > 1210)
+// 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
@@ -71,60 +71,48 @@
 //   See boost\config\suffix.hpp for BOOST_NO_LONG_LONG
 //
 #if ! __IBMCPP_AUTO_TYPEDEDUCTION
-#  define BOOST_NO_CXX11_AUTO_DECLARATIONS
-#  define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+#  define BOOST_NO_AUTO_DECLARATIONS
+#  define BOOST_NO_AUTO_MULTIDECLARATIONS
 #endif
 #if ! __IBMCPP_UTF_LITERAL__
-#  define BOOST_NO_CXX11_CHAR16_T
-#  define BOOST_NO_CXX11_CHAR32_T
-#endif
-#if ! __IBMCPP_CONSTEXPR
-#  define BOOST_NO_CXX11_CONSTEXPR
+#  define BOOST_NO_CHAR16_T
+#  define BOOST_NO_CHAR32_T
 #endif
+#define BOOST_NO_CONSTEXPR
 #if ! __IBMCPP_DECLTYPE
-#  define BOOST_NO_CXX11_DECLTYPE
+#  define BOOST_NO_DECLTYPE
 #else
 #  define BOOST_HAS_DECLTYPE
 #endif
-#define BOOST_NO_CXX11_DECLTYPE_N3276
-#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#define BOOST_NO_CXX11_DELETED_FUNCTIONS
-#if ! __IBMCPP_EXPLICIT_CONVERSION_OPERATORS
-#  define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
-#endif
+#define BOOST_NO_DEFAULTED_FUNCTIONS
+#define BOOST_NO_DELETED_FUNCTIONS
+#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
 #if ! __IBMCPP_EXTERN_TEMPLATE
-#  define BOOST_NO_CXX11_EXTERN_TEMPLATE
+#  define BOOST_NO_EXTERN_TEMPLATE
 #endif
 #if ! __IBMCPP_VARIADIC_TEMPLATES
 // not enabled separately at this time
-#  define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#endif
-#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#define BOOST_NO_CXX11_LAMBDAS
-#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_CXX11_NOEXCEPT
-#define BOOST_NO_CXX11_NULLPTR
-#define BOOST_NO_CXX11_RANGE_BASED_FOR
-#define BOOST_NO_CXX11_RAW_LITERALS
-#define BOOST_NO_CXX11_USER_DEFINED_LITERALS
-#if ! __IBMCPP_RVALUE_REFERENCES
-#  define BOOST_NO_CXX11_RVALUE_REFERENCES
-#endif
-#if ! __IBMCPP_SCOPED_ENUM
-#  define BOOST_NO_CXX11_SCOPED_ENUMS
+#  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_CXX11_UNIFIED_INITIALIZATION_SYNTAX
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
 #if ! __IBMCPP_STATIC_ASSERT
-#  define BOOST_NO_CXX11_STATIC_ASSERT
+#  define BOOST_NO_STATIC_ASSERT
 #endif
-#define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#define BOOST_NO_CXX11_UNICODE_LITERALS
+#define BOOST_NO_TEMPLATE_ALIASES
+#define BOOST_NO_UNICODE_LITERALS
 #if ! __IBMCPP_VARIADIC_TEMPLATES
-#  define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+#  define BOOST_NO_VARIADIC_TEMPLATES
 #endif
 #if ! __C99_MACRO_WITH_VA_ARGS
-#  define BOOST_NO_CXX11_VARIADIC_MACROS
+#  define BOOST_NO_VARIADIC_MACROS
 #endif


--- a/include/boost/config/compiler/visualc.hpp
+++ b/include/boost/config/compiler/visualc.hpp
@@ -9,54 +9,38 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 //  See http://www.boost.org for most recent version.
-//
+
 //  Microsoft Visual C++ compiler setup:
-//
-//  We need to be careful with the checks in this file, as contrary
-//  to popular belief there are versions with _MSC_VER with the final
-//  digit non-zero (mainly the MIPS cross compiler).
-//
-//  So we either test _MSC_VER >= XXXX or else _MSC_VER < XXXX.
-//  No other comparisons (==, >, or <=) are safe.
-//

 #define BOOST_MSVC _MSC_VER

-//
-// Helper macro BOOST_MSVC_FULL_VER for use in Boost code:
-//
 #if _MSC_FULL_VER > 100000000
 #  define BOOST_MSVC_FULL_VER _MSC_FULL_VER
 #else
 #  define BOOST_MSVC_FULL_VER (_MSC_FULL_VER * 10)
 #endif

-// Attempt to suppress VC6 warnings about the length of decorated names (obsolete):
+// turn off the warnings before we #include anything
 #pragma warning( disable : 4503 ) // warning: decorated name length exceeded

-//
-// versions check:
-// we don't support Visual C++ prior to version 6:
-#if _MSC_VER < 1200
-#  error "Compiler not supported or configured - please reconfigure"
-#endif
-
 #if _MSC_VER < 1300  // 1200 == VC++ 6.0, 1200-1202 == eVC++4
 #  pragma warning( disable : 4786 ) // ident trunc to '255' chars in debug info
 #  define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
 #  define BOOST_NO_VOID_RETURNS
 #  define BOOST_NO_EXCEPTION_STD_NAMESPACE

-#  if _MSC_VER == 1202
+#  if BOOST_MSVC == 1202
 #    define BOOST_NO_STD_TYPEINFO
 #  endif

+   // disable min/max macro defines on vc6:
+   //
 #endif

 /// Visual Studio has no fenv.h
 #define BOOST_NO_FENV_H

-#if (_MSC_VER < 1310)  // 130X == VC++ 7.0
+#if (_MSC_VER <= 1300)  // 1300 == VC++ 7.0

 #  if !defined(_MSC_EXTENSIONS) && !defined(BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS)      // VC7 bug with /Za
 #    define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
@@ -88,7 +72,7 @@
 #  define BOOST_NO_IS_ABSTRACT
 #  define BOOST_NO_FUNCTION_TYPE_SPECIALIZATIONS
 // TODO: what version is meant here? Have there really been any fixes in cl 12.01 (as e.g. shipped with eVC4)?
-#  if (_MSC_VER >= 1300)
+#  if (_MSC_VER > 1200)
 #     define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
 #  endif

@@ -99,9 +83,9 @@
 // it appears not to actually work:
 #  define BOOST_NO_SWPRINTF
 // Our extern template tests also fail for this compiler:
-#  define BOOST_NO_CXX11_EXTERN_TEMPLATE
+#  define BOOST_NO_EXTERN_TEMPLATE
 // Variadic macros do not exist for VC7.1 and lower
-#  define BOOST_NO_CXX11_VARIADIC_MACROS
+#  define BOOST_NO_VARIADIC_MACROS
 #endif

 #if defined(UNDER_CE)
@@ -109,16 +93,17 @@
 #  define BOOST_NO_SWPRINTF
 #endif

-#if _MSC_VER < 1500  // 140X == VC++ 8.0
+#if _MSC_VER <= 1400  // 1400 == VC++ 8.0
 #  define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 #endif

-#if _MSC_VER < 1600  // 150X == VC++ 9.0
+#if _MSC_VER == 1500  // 1500 == VC++ 9.0
   // A bug in VC9:
 #  define BOOST_NO_ADL_BARRIER
 #endif


+#if (_MSC_VER <= 1600)
 // MSVC (including the latest checked version) has not yet completely 
 // implemented value-initialization, as is reported:
 // "VC++ does not value-initialize members of derived classes without 
@@ -132,7 +117,12 @@
 // https://connect.microsoft.com/VisualStudio/feedback/details/100744
 // See also: http://www.boost.org/libs/utility/value_init.htm#compiler_issues
 // (Niels Dekker, LKEB, May 2010)
-#  define BOOST_NO_COMPLETE_VALUE_INITIALIZATION
+#define BOOST_NO_COMPLETE_VALUE_INITIALIZATION
+#endif
+
+#if _MSC_VER <= 1500  || !defined(BOOST_STRICT_CONFIG) // 1500 == VC++ 9.0
+#  define BOOST_NO_INITIALIZER_LISTS
+#endif

 #ifndef _NATIVE_WCHAR_T_DEFINED
 #  define BOOST_NO_INTRINSIC_WCHAR_T
@@ -179,16 +169,6 @@
 #  define BOOST_NO_RTTI
 #endif

-//
-// TR1 features:
-//
-#if _MSC_VER >= 1700
-// # define BOOST_HAS_TR1_HASH			// don't know if this is true yet.
-// # define BOOST_HAS_TR1_TYPE_TRAITS	// don't know if this is true yet.
-# define BOOST_HAS_TR1_UNORDERED_MAP
-# define BOOST_HAS_TR1_UNORDERED_SET
-#endif
-
 //
 // C++0x features
 //
@@ -197,52 +177,37 @@
 // C++ features supported by VC++ 10 (aka 2010)
 //
 #if _MSC_VER < 1600
-#  define BOOST_NO_CXX11_AUTO_DECLARATIONS
-#  define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-#  define BOOST_NO_CXX11_LAMBDAS
-#  define BOOST_NO_CXX11_RVALUE_REFERENCES
-#  define BOOST_NO_CXX11_STATIC_ASSERT
-#  define BOOST_NO_CXX11_NULLPTR
-#  define BOOST_NO_CXX11_DECLTYPE
+#define BOOST_NO_AUTO_DECLARATIONS
+#define BOOST_NO_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_LAMBDAS
+#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
-#  define BOOST_HAS_STDINT_H
+#define BOOST_HAS_STDINT_H
 #endif

-// C++ features supported by VC++ 11 (aka 2012)
-//
-#if _MSC_VER < 1700
-#  define BOOST_NO_CXX11_RANGE_BASED_FOR
-#  define BOOST_NO_CXX11_SCOPED_ENUMS
-#endif // _MSC_VER < 1700
-
-// C++11 features supported by VC++ 11 (aka 2012) November 2012 CTP
-// Because the CTP is unsupported, unrelease, and only alpha quality,
-// it is only supported if BOOST_MSVC_ENABLE_2012_NOV_CTP is defined.
-//
-#if _MSC_FULL_VER < 170051025 || !defined(BOOST_MSVC_ENABLE_2012_NOV_CTP)
-#  define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
-#  define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#  define BOOST_NO_CXX11_RAW_LITERALS
-#  define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-#  define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
-#endif
-
-// C++11 features not supported by any versions
-#define BOOST_NO_CXX11_CHAR16_T
-#define BOOST_NO_CXX11_CHAR32_T
-#define BOOST_NO_CXX11_CONSTEXPR
-#define BOOST_NO_CXX11_DECLTYPE_N3276
-#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#define BOOST_NO_CXX11_DELETED_FUNCTIONS
-#define BOOST_NO_CXX11_NOEXCEPT
-#define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#define BOOST_NO_CXX11_UNICODE_LITERALS
+// C++0x features not supported by any versions
+#define BOOST_NO_CHAR16_T
+#define BOOST_NO_CHAR32_T
+#define BOOST_NO_CONSTEXPR
+#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_NOEXCEPT
+#define BOOST_NO_RAW_LITERALS
+#define BOOST_NO_SCOPED_ENUMS
+#define BOOST_NO_TEMPLATE_ALIASES
+#define BOOST_NO_UNICODE_LITERALS
+#define BOOST_NO_VARIADIC_TEMPLATES
 #define BOOST_NO_SFINAE_EXPR
 #define BOOST_NO_TWO_PHASE_NAME_LOOKUP
-#define BOOST_NO_CXX11_USER_DEFINED_LITERALS
-
+#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
 //
 // prefix and suffix headers:
 //
@@ -253,7 +218,6 @@
 #  define BOOST_ABI_SUFFIX "boost/config/abi/msvc_suffix.hpp"
 #endif

-#ifndef BOOST_COMPILER
 // TODO:
 // these things are mostly bogus. 1200 means version 12.0 of the compiler. The 
 // artificial versions assigned to them only refer to the versions of some IDE
@@ -265,21 +229,12 @@
      // Note: these are so far off, they are not really supported
 #   elif _MSC_VER < 1300 // eVC++ 4 comes with 1200-1202
 #     define BOOST_COMPILER_VERSION evc4.0
-#   elif _MSC_VER < 1400
-      // Note: I'm not aware of any CE compiler with version 13xx
-#      if defined(BOOST_ASSERT_CONFIG)
-#         error "Unknown EVC++ compiler version - please run the configure tests and report the results"
-#      else
-#         pragma message("Unknown EVC++ compiler version - please run the configure tests and report the results")
-#      endif
-#   elif _MSC_VER < 1500
+#   elif _MSC_VER == 1400
 #     define BOOST_COMPILER_VERSION evc8
-#   elif _MSC_VER < 1600
+#   elif _MSC_VER == 1500
 #     define BOOST_COMPILER_VERSION evc9
-#   elif _MSC_VER < 1700
+#   elif _MSC_VER == 1600
 #     define BOOST_COMPILER_VERSION evc10
-#   elif _MSC_VER < 1800 
-#     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"
@@ -293,29 +248,32 @@
 #     define BOOST_COMPILER_VERSION 5.0
 #   elif _MSC_VER < 1300
 #       define BOOST_COMPILER_VERSION 6.0
-#   elif _MSC_VER < 1310
+#   elif _MSC_VER == 1300
 #     define BOOST_COMPILER_VERSION 7.0
-#   elif _MSC_VER < 1400
+#   elif _MSC_VER == 1310
 #     define BOOST_COMPILER_VERSION 7.1
-#   elif _MSC_VER < 1500
+#   elif _MSC_VER == 1400
 #     define BOOST_COMPILER_VERSION 8.0
-#   elif _MSC_VER < 1600
+#   elif _MSC_VER == 1500
 #     define BOOST_COMPILER_VERSION 9.0
-#   elif _MSC_VER < 1700
+#   elif _MSC_VER == 1600
 #     define BOOST_COMPILER_VERSION 10.0
-#   elif _MSC_VER < 1800 
-#     define BOOST_COMPILER_VERSION 11.0 
 #   else
 #     define BOOST_COMPILER_VERSION _MSC_VER
 #   endif
 # endif

-#  define BOOST_COMPILER "Microsoft Visual C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
-#endif
+#define BOOST_COMPILER "Microsoft Visual C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)

 //
-// last known and checked version is 1700 (VC11, aka 2011):
-#if (_MSC_VER > 1700)
+// versions check:
+// we don't support Visual C++ prior to version 6:
+#if _MSC_VER < 1200
+#error "Compiler not supported or configured - please reconfigure"
+#endif
+//
+// last known and checked version is 1600 (VC10, aka 2010):
+#if (_MSC_VER > 1600)
 #  if defined(BOOST_ASSERT_CONFIG)
 #     error "Unknown compiler version - please run the configure tests and report the results"
 #  else
--- a/include/boost/config/platform/cray.hpp
+++ b/include/boost/config/platform/cray.hpp
@@ -1,18 +0,0 @@
-//  (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/vxworks.hpp
+++ b/include/boost/config/platform/vxworks.hpp
@@ -1,369 +1,31 @@
-//  (C) Copyright Dustin Spicuzza 2009.
-//      Adapted to vxWorks 6.9 by Peter Brockamp 2012.
-//  Use, modification and distribution are subject to the
-//  Boost Software License, Version 1.0. (See accompanying file
+//  (C) Copyright Dustin Spicuzza 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 for most recent version.

-//  Since WRS does not yet properly support boost under vxWorks
-//  and this file was badly outdated, but I was keen on using it,
-//  I patched boost myself to make things work. This has been tested
-//  and adapted by me for vxWorks 6.9 *only*, as I'm lacking access
-//  to earlier 6.X versions! The only thing I know for sure is that
-//  very old versions of vxWorks (namely everything below 6.x) are
-//  absolutely unable to use boost. This is mainly due to the completely
-//  outdated libraries and ancient compiler (GCC 2.96 or worse). Do
-//  not even think of getting this to work, a miserable failure will
-//  be guaranteed!
-//  Equally, this file has been tested for RTPs (Real Time Processes)
-//  only, not for DKMs (Downloadable Kernel Modules). These two types
-//  of executables differ largely in the available functionality of
-//  the C-library, STL, and so on. A DKM uses a library similar to those
-//  of vxWorks 5.X - with all its limitations and incompatibilities
-//  with respect to ANSI C++ and STL. So probably there might be problems
-//  with the usage of boost from DKMs. WRS or any voluteers are free to
-//  prove the opposite!
+//  vxWorks specific config options:

-// ====================================================================
-//
-// Some important information regarding the usage of POSIX semaphores:
-// -------------------------------------------------------------------
-//
-// VxWorks as a real time operating system handles threads somewhat
-// different from what "normal" OSes do, regarding their scheduling!
-// This could lead to a scenario called "priority inversion" when using
-// semaphores, see http://en.wikipedia.org/wiki/Priority_inversion.
-//
-// Now, VxWorks POSIX-semaphores for DKM's default to the usage of
-// priority inverting semaphores, which is fine. On the other hand,
-// for RTP's it defaults to using non priority inverting semaphores,
-// which could easily pose a serious problem for a real time process,
-// i.e. deadlocks! To overcome this two possibilities do exist:
-//
-// a) Patch every piece of boost that uses semaphores to instanciate
-//    the proper type of semaphores. This is non-intrusive with respect
-//    to the OS and could relatively easy been done by giving all
-//    semaphores attributes deviating from the default (for in-depth
-//    information see the POSIX functions pthread_mutexattr_init()
-//    and pthread_mutexattr_setprotocol()). However this breaks all
-//    too easily, as with every new version some boost library could
-//    all in a sudden start using semaphores, resurrecting the very
-//    same, hard to locate problem over and over again!
-//
-// b) We could change the default properties for POSIX-semaphores
-//    that VxWorks uses for RTP's and this is being suggested here,
-//    as it will more or less seamlessly integrate with boost. I got
-//    the following information from WRS how to do this, compare
-//    Wind River TSR# 1209768:
-//
-// Instructions for changing the default properties of POSIX-
-// semaphores for RTP's in VxWorks 6.9:
-// - Edit the file /vxworks-6.9/target/usr/src/posix/pthreadLib.c
-//   in the root of your Workbench-installation.
-// - Around line 917 there should be the definition of the default
-//   mutex attributes:
-//
-//   LOCAL pthread_mutexattr_t defaultMutexAttr =
-//       {
-//       PTHREAD_INITIALIZED_OBJ, PTHREAD_PRIO_NONE, 0,
-//       PTHREAD_MUTEX_DEFAULT
-//       };
-//
-//   Here, replace PTHREAD_PRIO_NONE by PTHREAD_PRIO_INHERIT.
-// - Around line 1236 there should be a definition for the function
-//   pthread_mutexattr_init(). A couple of lines below you should
-//   find a block of code like this:
-//
-//   pAttr->mutexAttrStatus      = PTHREAD_INITIALIZED_OBJ;
-//   pAttr->mutexAttrProtocol    = PTHREAD_PRIO_NONE;
-//   pAttr->mutexAttrPrioceiling = 0;
-//   pAttr->mutexAttrType        = PTHREAD_MUTEX_DEFAULT;
-//
-//   Here again, replace PTHREAD_PRIO_NONE by PTHREAD_PRIO_INHERIT.
-// - Finally, rebuild your VSB. This will create a new VxWorks kernel
-//   with the changed properties. That's it! Now, using boost should
-//   no longer cause any problems with task deadlocks!
-//
-// And here's another useful piece of information concerning VxWorks'
-// POSIX-functionality in general:
-// VxWorks is not a genuine POSIX-OS in itself, rather it is using a
-// kind of compatibility layer (sort of a wrapper) to emulate the
-// POSIX-functionality by using its own resources and functions.
-// At the time a task (thread) calls it's first POSIX-function during
-// runtime it is being transformed by the OS into a POSIX-thread.
-// This transformation does include a call to malloc() to allocate the
-// memory required for the housekeeping of POSIX-threads. In a high
-// priority RTP this malloc() call may be highly undesirable, as its
-// timing is more or less unpredictable (depending on what your actual
-// heap looks like). You can circumvent this problem by calling the
-// function thread_self() at a well defined point in the code of the
-// task, e.g. shortly after the task spawns up. Thereby you are able
-// to define the time when the task-transformation will take place and
-// you could shift it to an uncritical point where a malloc() call is
-// tolerable. So, if this could pose a problem for your code, remember
-// to call thread_self() from the affected task at an early stage.
-//
-// ====================================================================
-
-// Block out all versions before vxWorks 6.x, as these don't work:
-// Include header with the vxWorks version information and query them
-#include <version.h>
-#if !defined(_WRS_VXWORKS_MAJOR) || (_WRS_VXWORKS_MAJOR < 6)
-#  error "The vxWorks version you're using is so badly outdated,\
-          it doesn't work at all with boost, sorry, no chance!"
-#endif
-
-// Handle versions above 5.X but below 6.9
-#if (_WRS_VXWORKS_MAJOR == 6) && (_WRS_VXWORKS_MINOR < 9)
-// TODO: Starting from what version does vxWorks work with boost?
-// We can't reasonably insert a #warning "" as a user hint here,
-// as this will show up with every file including some boost header,
-// badly bugging the user... So for the time being we just leave it.
-#endif
-
-// vxWorks specific config options:
-// --------------------------------
 #define BOOST_PLATFORM "vxWorks"

-// Special behaviour for DKMs:
-#ifdef _WRS_KERNEL
-  // DKMs do not have the <cwchar>-header,
-  // but apparently they do have an intrinsic wchar_t meanwhile!
-#  define BOOST_NO_CWCHAR
+#define BOOST_NO_CWCHAR
+#define BOOST_NO_INTRINSIC_WCHAR_T

-  // Lots of wide-functions and -headers are unavailable for DKMs as well:
-#  define BOOST_NO_CWCTYPE
-#  define BOOST_NO_SWPRINTF
-#  define BOOST_NO_STD_WSTRING
-#  define BOOST_NO_STD_WSTREAMBUF
+#if defined(__GNUC__) && defined(__STRICT_ANSI__)
+#define BOOST_NO_INT64_T
 #endif

-// Generally available headers:
 #define BOOST_HAS_UNISTD_H
-#define BOOST_HAS_STDINT_H
-#define BOOST_HAS_DIRENT_H
-#define BOOST_HAS_SLIST

-// vxWorks does not have installed an iconv-library by default,
-// so unfortunately no Unicode support from scratch is available!
-// Thus, instead it is suggested to switch to ICU, as this seems
-// to be the most complete and portable option...
-#define BOOST_LOCALE_WITH_ICU
+// these allow posix_features to work, since vxWorks doesn't
+// define them itself
+#define _POSIX_TIMERS 1
+#define _POSIX_THREADS 1

-// Generally available functionality:
-#define BOOST_HAS_THREADS
-#define BOOST_HAS_NANOSLEEP
-#define BOOST_HAS_GETTIMEOFDAY
-#define BOOST_HAS_CLOCK_GETTIME
-#define BOOST_HAS_MACRO_USE_FACET
-
-// Generally unavailable functionality, delivered by boost's test function:
-//#define BOOST_NO_DEDUCED_TYPENAME // Commented this out, boost's test gives an errorneous result!
-#define BOOST_NO_CXX11_EXTERN_TEMPLATE
-#define BOOST_NO_CXX11_VARIADIC_MACROS
-
-// Generally available threading API's:
-#define BOOST_HAS_PTHREADS
-#define BOOST_HAS_SCHED_YIELD
-#define BOOST_HAS_SIGACTION
-
-// Functionality available for RTPs only:
-#ifdef __RTP__
-#  define BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
-#  define BOOST_HAS_LOG1P
-#  define BOOST_HAS_EXPM1
-#endif
-
-// Functionality available for DKMs only:
-#ifdef _WRS_KERNEL
-  // Luckily, at the moment there seems to be none!
-#endif
-
-// These #defines allow posix_features to work, since vxWorks doesn't
-// #define them itself for DKMs (for RTPs on the contrary it does):
-#ifdef _WRS_KERNEL
-#  ifndef _POSIX_TIMERS
-#    define _POSIX_TIMERS  1
-#  endif
-#  ifndef _POSIX_THREADS
-#    define _POSIX_THREADS 1
-#  endif
-#endif
-
-// vxWorks doesn't work with asio serial ports:
+// vxworks doesn't work with asio serial ports
 #define BOOST_ASIO_DISABLE_SERIAL_PORT
-// TODO: The problem here seems to bee that vxWorks uses its own, very specific
-//       ways to handle serial ports, incompatible with POSIX or anything...
-//       Maybe a specific implementation would be possible, but until the
-//       straight need arises... This implementation would presumably consist
-//       of some vxWorks specific ioctl-calls, etc. Any voluteers?

-// vxWorks-around: <time.h> #defines CLOCKS_PER_SEC as sysClkRateGet() but
-//                 miserably fails to #include the required <sysLib.h> to make
-//                 sysClkRateGet() available! So we manually include it here.
-#ifdef __RTP__
-#  include <time.h>
-#  include <sysLib.h>
-#endif
-
-// vxWorks-around: In <stdint.h> the macros INT32_C(), UINT32_C(), INT64_C() and
-//                 UINT64_C() are defined errorneously, yielding not a signed/
-//                 unsigned long/long long type, but a signed/unsigned int/long
-//                 type. Eventually this leads to compile errors in ratio_fwd.hpp,
-//                 when trying to define several constants which do not fit into a
-//                 long type! We correct them here by redefining.
-#include <cstdint>
-
-// Some macro-magic to do the job
-#define VX_JOIN(X, Y)     VX_DO_JOIN(X, Y)
-#define VX_DO_JOIN(X, Y)  VX_DO_JOIN2(X, Y)
-#define VX_DO_JOIN2(X, Y) X##Y
-
-// Correctly setup the macros
-#undef  INT32_C
-#undef  UINT32_C
-#undef  INT64_C
-#undef  UINT64_C
-#define INT32_C(x)  VX_JOIN(x, L)
-#define UINT32_C(x) VX_JOIN(x, UL)
-#define INT64_C(x)  VX_JOIN(x, LL)
-#define UINT64_C(x) VX_JOIN(x, ULL)
-
-// #include Libraries required for the following function adaption
-#include <ioLib.h>
-#include <tickLib.h>
-#include <sys/time.h>
-
-// Use C-linkage for the following helper functions
-extern "C" {
-
-// vxWorks-around: The required functions getrlimit() and getrlimit() are missing.
-//                 But we have the similar functions getprlimit() and setprlimit(),
-//                 which may serve the purpose.
-//                 Problem: The vxWorks-documentation regarding these functions
-//                 doesn't deserve its name! It isn't documented what the first two
-//                 parameters idtype and id mean, so we must fall back to an educated
-//                 guess - null, argh... :-/
-
-// TODO: getprlimit() and setprlimit() do exist for RTPs only, for whatever reason.
-//       Thus for DKMs there would have to be another implementation.
-#ifdef __RTP__
-  inline int getrlimit(int resource, struct rlimit *rlp){
-    return getprlimit(0, 0, resource, rlp);
-  }
-
-  inline int setrlimit(int resource, const struct rlimit *rlp){
-    return setprlimit(0, 0, resource, const_cast<struct rlimit*>(rlp));
-  }
-#endif
-
-// vxWorks has ftruncate() only, so we do simulate truncate():
-inline int truncate(const char *p, off_t l){
-  int fd = open(p, O_WRONLY);
-  if (fd == -1){
-    errno = EACCES;
-    return -1;
-  }
-  if (ftruncate(fd, l) == -1){
-    close(fd);
-    errno = EACCES;
-    return -1;
-  }
-  return close(fd);
-}
-
-// Fake symlink handling by dummy functions:
-inline int symlink(const char*, const char*){
-  // vxWorks has no symlinks -> always return an error!
-  errno = EACCES;
-  return -1;
-}
-
-inline ssize_t readlink(const char*, char*, size_t){
-  // vxWorks has no symlinks -> always return an error!
-  errno = EACCES;
-  return -1;
-}
-
-// vxWorks claims to implement gettimeofday in sys/time.h
-// but nevertheless does not provide it! See
-// https://support.windriver.com/olsPortal/faces/maintenance/techtipDetail_noHeader.jspx?docId=16442&contentId=WR_TECHTIP_006256
-// We implement a surrogate version here via clock_gettime:
-inline int gettimeofday(struct timeval *tv, void * /*tzv*/) {
-  struct timespec ts;
-  clock_gettime(CLOCK_MONOTONIC, &ts);
-  tv->tv_sec  = ts.tv_sec;
-  tv->tv_usec = ts.tv_nsec / 1000;
-  return 0;
-}
-
-// vxWorks does provide neither struct tms nor function times()!
-// We implement an empty dummy-function, simply setting the user
-// and system time to the half of thew actual system ticks-value
-// and the child user and system time to 0.
-// Rather ugly but at least it suppresses compiler errors...
-// Unfortunately, this of course *does* have an severe impact on
-// dependant libraries, actually this is chrono only! Here it will
-// not be possible to correctly use user and system times! But
-// as vxWorks is lacking the ability to calculate user and system
-// process times there seems to be no other possible solution.
-struct tms{
-  clock_t tms_utime;  // User CPU time
-  clock_t tms_stime;  // System CPU time
-  clock_t tms_cutime; // User CPU time of terminated child processes
-  clock_t tms_cstime; // System CPU time of terminated child processes
-};
-
-inline clock_t times(struct tms *t){
-  struct timespec ts;
-  clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts);
-  clock_t ticks(static_cast<clock_t>(static_cast<double>(ts.tv_sec)  * CLOCKS_PER_SEC +
-                                     static_cast<double>(ts.tv_nsec) * CLOCKS_PER_SEC / 1000000.0));
-  t->tms_utime  = ticks/2U;
-  t->tms_stime  = ticks/2U;
-  t->tms_cutime = 0; // vxWorks is lacking the concept of a child process!
-  t->tms_cstime = 0; // -> Set the wait times for childs to 0
-  return ticks;
-}
-
-} // extern "C"
-
-// Put the selfmade functions into the std-namespace, just in case
-namespace std {
-# ifdef __RTP__
-    using ::getrlimit;
-    using ::setrlimit;
-# endif
-  using ::truncate;
-  using ::symlink;
-  using ::readlink;
-  using ::times;
-  using ::gettimeofday;
-}
-
-// Some more macro-magic:
-// vxWorks-around: Some functions are not present or broken in vxWorks
-//                 but may be patched to life via helper macros...
-
-// Include signal.h which might contain a typo to be corrected here
-#include <signal.h>
-
-#define getpagesize()    sysconf(_SC_PAGESIZE)         // getpagesize is deprecated anyway!
-#ifndef S_ISSOCK
-#  define S_ISSOCK(mode) ((mode & S_IFMT) == S_IFSOCK) // Is file a socket?
-#endif
-#define lstat(p, b)      stat(p, b)                    // lstat() == stat(), as vxWorks has no symlinks!
-#ifndef FPE_FLTINV
-#  define FPE_FLTINV     (FPE_FLTSUB+1)                // vxWorks has no FPE_FLTINV, so define one as a dummy
-#endif
-#if !defined(BUS_ADRALN) && defined(BUS_ADRALNR)
-#  define BUS_ADRALN     BUS_ADRALNR                   // Correct a supposed typo in vxWorks' <signal.h>
-#endif
-//typedef int              locale_t;                     // locale_t is a POSIX-extension, currently unpresent in vxWorks!
-
-// #include boilerplate code:
+// boilerplate code:
 #include <boost/config/posix_features.hpp>
-
-// vxWorks lies about XSI conformance, there is no nl_types.h:
-#undef BOOST_HAS_NL_TYPES_H
+ 
--- a/include/boost/config/platform/win32.hpp
+++ b/include/boost/config/platform/win32.hpp
@@ -33,9 +33,7 @@

 #if defined(__MINGW32__) && ((__MINGW32_MAJOR_VERSION > 2) || ((__MINGW32_MAJOR_VERSION == 2) && (__MINGW32_MINOR_VERSION >= 0)))
 #  define BOOST_HAS_STDINT_H
-#  ifndef __STDC_LIMIT_MACROS
-#     define __STDC_LIMIT_MACROS
-#  endif
+#  define __STDC_LIMIT_MACROS
 #  define BOOST_HAS_DIRENT_H
 #  define BOOST_HAS_UNISTD_H
 #endif
@@ -57,8 +55,6 @@

 #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
@@ -17,10 +17,6 @@
 // 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"
@@ -33,10 +29,6 @@
 // PathScale EKOPath compiler (has to come before clang and gcc)
 #   define BOOST_COMPILER_CONFIG "boost/config/compiler/pathscale.hpp"

-#elif defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)
-//  Intel
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/intel.hpp"
-
 #elif defined __clang__
 //  Clang C++ emulates GCC, so it has to appear early.
 #   define BOOST_COMPILER_CONFIG "boost/config/compiler/clang.hpp"
@@ -45,6 +37,10 @@
 //  Digital Mars C++
 #   define BOOST_COMPILER_CONFIG "boost/config/compiler/digitalmars.hpp"

+#elif defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)
+//  Intel
+#   define BOOST_COMPILER_CONFIG "boost/config/compiler/intel.hpp"
+
 # elif defined __GNUC__
 //  GNU C++:
 #   define BOOST_COMPILER_CONFIG "boost/config/compiler/gcc.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__)) && !defined(_CRAYC)
+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) 
 // 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,10 +69,6 @@
 // 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/stdlib/dinkumware.hpp
+++ b/include/boost/config/stdlib/dinkumware.hpp
@@ -87,51 +87,41 @@
 #endif

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

 //  C++0x headers implemented in 520 (as shipped by Microsoft)
 //
 #if !defined(_CPPLIB_VER) || _CPPLIB_VER < 520
-#  define BOOST_NO_CXX11_HDR_ARRAY
-#  define BOOST_NO_CXX11_HDR_CODECVT
-#  define BOOST_NO_CXX11_HDR_FORWARD_LIST
-#  define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#  define BOOST_NO_CXX11_HDR_RANDOM
-#  define BOOST_NO_CXX11_HDR_REGEX
-#  define BOOST_NO_CXX11_HDR_SYSTEM_ERROR
-#  define BOOST_NO_CXX11_HDR_UNORDERED_MAP
-#  define BOOST_NO_CXX11_HDR_UNORDERED_SET
-#  define BOOST_NO_CXX11_HDR_TUPLE
-#  define BOOST_NO_CXX11_HDR_TYPEINDEX
-#  define BOOST_NO_CXX11_HDR_FUNCTIONAL
-#  define BOOST_NO_CXX11_NUMERIC_LIMITS
-#  define BOOST_NO_CXX11_SMART_PTR
+#  define BOOST_NO_0X_HDR_ARRAY
+#  define BOOST_NO_0X_HDR_CODECVT
+#  define BOOST_NO_0X_HDR_FORWARD_LIST
+#  define BOOST_NO_0X_HDR_INITIALIZER_LIST
+#  define BOOST_NO_0X_HDR_RANDOM
+#  define BOOST_NO_0X_HDR_REGEX
+#  define BOOST_NO_0X_HDR_SYSTEM_ERROR
+#  define BOOST_NO_STD_UNORDERED        // deprecated; see following
+#  define BOOST_NO_0X_HDR_UNORDERED_MAP
+#  define BOOST_NO_0X_HDR_UNORDERED_SET
+#  define BOOST_NO_0X_HDR_TUPLE
+#  define BOOST_NO_0X_HDR_TYPEINDEX
+#  define BOOST_NO_NUMERIC_LIMITS_LOWEST
 #endif

-#if (!defined(_HAS_TR1_IMPORTS) || (_HAS_TR1_IMPORTS+0 == 0)) && !defined(BOOST_NO_CXX11_HDR_TUPLE)
-#  define BOOST_NO_CXX11_HDR_TUPLE
+#if !defined(_HAS_TR1_IMPORTS) && !defined(BOOST_NO_0X_HDR_TUPLE)
+#  define BOOST_NO_0X_HDR_TUPLE
 #endif
-
-//  C++0x headers implemented in 540 (as shipped by Microsoft)
-//
-#if !defined(_CPPLIB_VER) || _CPPLIB_VER < 540
-#  define BOOST_NO_CXX11_HDR_TYPE_TRAITS
-#  define BOOST_NO_CXX11_HDR_CHRONO
-#  define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_CXX11_HDR_FUTURE
-#  define BOOST_NO_CXX11_HDR_MUTEX
-#  define BOOST_NO_CXX11_HDR_RATIO
-#  define BOOST_NO_CXX11_HDR_THREAD
-#  define BOOST_NO_CXX11_ALLOCATOR
-#  define BOOST_NO_CXX11_ATOMIC_SMART_PTR
-#endif
-
 //
 //  C++0x headers not yet (fully) implemented:
 //
-#  define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
+#  define BOOST_NO_0X_HDR_TYPE_TRAITS
+#  define BOOST_NO_0X_HDR_CHRONO
+#  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  define BOOST_NO_0X_HDR_FUTURE
+#  define BOOST_NO_0X_HDR_MUTEX
+#  define BOOST_NO_0X_HDR_RATIO
+#  define BOOST_NO_0X_HDR_THREAD

 #ifdef _CPPLIB_VER
 #  define BOOST_DINKUMWARE_STDLIB _CPPLIB_VER
--- a/include/boost/config/stdlib/libcomo.hpp
+++ b/include/boost/config/stdlib/libcomo.hpp
@@ -35,29 +35,26 @@

 //  C++0x headers not yet implemented
 //
-#  define BOOST_NO_CXX11_HDR_ARRAY
-#  define BOOST_NO_CXX11_HDR_CHRONO
-#  define BOOST_NO_CXX11_HDR_CODECVT
-#  define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_CXX11_HDR_FORWARD_LIST
-#  define BOOST_NO_CXX11_HDR_FUTURE
-#  define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#  define BOOST_NO_CXX11_HDR_MUTEX
-#  define BOOST_NO_CXX11_HDR_RANDOM
-#  define BOOST_NO_CXX11_HDR_RATIO
-#  define BOOST_NO_CXX11_HDR_REGEX
-#  define BOOST_NO_CXX11_HDR_SYSTEM_ERROR
-#  define BOOST_NO_CXX11_HDR_THREAD
-#  define BOOST_NO_CXX11_HDR_TUPLE
-#  define BOOST_NO_CXX11_HDR_TYPE_TRAITS
-#  define BOOST_NO_CXX11_HDR_TYPEINDEX
-#  define BOOST_NO_CXX11_HDR_UNORDERED_MAP
-#  define BOOST_NO_CXX11_HDR_UNORDERED_SET
-#  define BOOST_NO_CXX11_NUMERIC_LIMITS
-#  define BOOST_NO_CXX11_ALLOCATOR
-#  define BOOST_NO_CXX11_ATOMIC_SMART_PTR
-#  define BOOST_NO_CXX11_SMART_PTR
-#  define BOOST_NO_CXX11_HDR_FUNCTIONAL
+#  define BOOST_NO_0X_HDR_ARRAY
+#  define BOOST_NO_0X_HDR_CHRONO
+#  define BOOST_NO_0X_HDR_CODECVT
+#  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  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_MUTEX
+#  define BOOST_NO_0X_HDR_RANDOM
+#  define BOOST_NO_0X_HDR_RATIO
+#  define BOOST_NO_0X_HDR_REGEX
+#  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
+#  define BOOST_NO_0X_HDR_UNORDERED_SET
+#  define BOOST_NO_NUMERIC_LIMITS_LOWEST

 //
 // Intrinsic type_traits support.
--- a/include/boost/config/stdlib/libcpp.hpp
+++ b/include/boost/config/stdlib/libcpp.hpp
@@ -20,16 +20,15 @@
 #define BOOST_HAS_THREADS

 #ifdef _LIBCPP_HAS_NO_VARIADICS
-#    define BOOST_NO_CXX11_HDR_TUPLE
+#    define BOOST_NO_0X_HDR_TUPLE
 #endif

 //
 // These appear to be unusable/incomplete so far:
 //
-#  define BOOST_NO_CXX11_HDR_CHRONO
-#  define BOOST_NO_CXX11_HDR_FUTURE
-#  define BOOST_NO_CXX11_HDR_TYPE_TRAITS
-#  define BOOST_NO_CXX11_ATOMIC_SMART_PTR
+#  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
--- a/include/boost/config/stdlib/libstdcpp3.hpp
+++ b/include/boost/config/stdlib/libstdcpp3.hpp
@@ -33,10 +33,7 @@

 #ifdef __GLIBCXX__ // gcc 3.4 and greater:
 #  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
-        || defined(_GLIBCXX__PTHREADS) \
-        || defined(_GLIBCXX_HAS_GTHREADS) \
-        || defined(_WIN32) \
-        || defined(_AIX)
+        || defined(_GLIBCXX__PTHREADS)
      //
      // 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
@@ -106,61 +103,51 @@
 //  C++0x headers in GCC 4.3.0 and later
 //
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
-#  define BOOST_NO_CXX11_HDR_ARRAY
-#  define BOOST_NO_CXX11_HDR_REGEX
-#  define BOOST_NO_CXX11_HDR_TUPLE
-#  define BOOST_NO_CXX11_HDR_UNORDERED_MAP
-#  define BOOST_NO_CXX11_HDR_UNORDERED_SET
-#  define BOOST_NO_CXX11_HDR_FUNCTIONAL
+#  define BOOST_NO_0X_HDR_ARRAY
+#  define BOOST_NO_0X_HDR_REGEX
+#  define BOOST_NO_0X_HDR_TUPLE
+#  define BOOST_NO_STD_UNORDERED  // deprecated; see following
+#  define BOOST_NO_0X_HDR_UNORDERED_MAP
+#  define BOOST_NO_0X_HDR_UNORDERED_SET
 #endif

 //  C++0x headers in GCC 4.4.0 and later
 //
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
-#  define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_CXX11_HDR_FORWARD_LIST
-#  define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#  define BOOST_NO_CXX11_HDR_MUTEX
-#  define BOOST_NO_CXX11_HDR_RATIO
-#  define BOOST_NO_CXX11_HDR_SYSTEM_ERROR
-#  define BOOST_NO_CXX11_SMART_PTR
+#  define BOOST_NO_0X_HDR_CHRONO
+#  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  define BOOST_NO_0X_HDR_FORWARD_LIST
+#  define BOOST_NO_0X_HDR_INITIALIZER_LIST
+#  define BOOST_NO_0X_HDR_MUTEX
+#  define BOOST_NO_0X_HDR_RATIO
+#  define BOOST_NO_0X_HDR_SYSTEM_ERROR
 #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_CXX11_HDR_CONDITION_VARIABLE) || !defined(BOOST_NO_CXX11_HDR_MUTEX))
-#  define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_CXX11_HDR_MUTEX
+#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_CXX11_NUMERIC_LIMITS
-#  define BOOST_NO_CXX11_HDR_FUTURE
-#  define BOOST_NO_CXX11_HDR_RANDOM
+#  define BOOST_NO_NUMERIC_LIMITS_LOWEST
+#  define BOOST_NO_0X_HDR_FUTURE
+#  define BOOST_NO_0X_HDR_RANDOM
 #endif

-//  C++0x features in GCC 4.6.0 and later
+//  C++0x features in GCC 4.5.0 and later
 //
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
-#  define BOOST_NO_CXX11_HDR_TYPEINDEX
-#endif
-
-//  C++0x features in GCC 4.7.0 and later
-//
-#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
-// Note that although <chrono> existed prior to 4.7, "stead_clock" is spelled "monotonic_clock"
-// so 4.7.0 is the first truely conforming one.
-#  define BOOST_NO_CXX11_HDR_CHRONO
-#  define BOOST_NO_CXX11_ALLOCATOR
+#  define BOOST_NO_0X_HDR_TYPEINDEX
 #endif
 //  C++0x headers not yet (fully!) implemented
 //
-#  define BOOST_NO_CXX11_HDR_THREAD
-#  define BOOST_NO_CXX11_HDR_TYPE_TRAITS
-#  define BOOST_NO_CXX11_HDR_CODECVT
-#  define BOOST_NO_CXX11_ATOMIC_SMART_PTR
+#  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
@@ -24,29 +24,26 @@

 //  C++0x headers not yet implemented
 //
-#  define BOOST_NO_CXX11_HDR_ARRAY
-#  define BOOST_NO_CXX11_HDR_CHRONO
-#  define BOOST_NO_CXX11_HDR_CODECVT
-#  define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_CXX11_HDR_FORWARD_LIST
-#  define BOOST_NO_CXX11_HDR_FUTURE
-#  define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#  define BOOST_NO_CXX11_HDR_MUTEX
-#  define BOOST_NO_CXX11_HDR_RANDOM
-#  define BOOST_NO_CXX11_HDR_RATIO
-#  define BOOST_NO_CXX11_HDR_REGEX
-#  define BOOST_NO_CXX11_HDR_SYSTEM_ERROR
-#  define BOOST_NO_CXX11_HDR_THREAD
-#  define BOOST_NO_CXX11_HDR_TUPLE
-#  define BOOST_NO_CXX11_HDR_TYPE_TRAITS
-#  define BOOST_NO_CXX11_HDR_TYPEINDEX
-#  define BOOST_NO_CXX11_HDR_UNORDERED_MAP
-#  define BOOST_NO_CXX11_HDR_UNORDERED_SET
-#  define BOOST_NO_CXX11_NUMERIC_LIMITS
-#  define BOOST_NO_CXX11_ALLOCATOR
-#  define BOOST_NO_CXX11_ATOMIC_SMART_PTR
-#  define BOOST_NO_CXX11_SMART_PTR
-#  define BOOST_NO_CXX11_HDR_FUNCTIONAL
+#  define BOOST_NO_0X_HDR_ARRAY
+#  define BOOST_NO_0X_HDR_CHRONO
+#  define BOOST_NO_0X_HDR_CODECVT
+#  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  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_MUTEX
+#  define BOOST_NO_0X_HDR_RANDOM
+#  define BOOST_NO_0X_HDR_RATIO
+#  define BOOST_NO_0X_HDR_REGEX
+#  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
+#  define BOOST_NO_0X_HDR_UNORDERED_SET
+#  define BOOST_NO_NUMERIC_LIMITS_LOWEST

 #define BOOST_STDLIB "Modena C++ standard library"

--- a/include/boost/config/stdlib/msl.hpp
+++ b/include/boost/config/stdlib/msl.hpp
@@ -48,29 +48,26 @@

 //  C++0x headers not yet implemented
 //
-#  define BOOST_NO_CXX11_HDR_ARRAY
-#  define BOOST_NO_CXX11_HDR_CHRONO
-#  define BOOST_NO_CXX11_HDR_CODECVT
-#  define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_CXX11_HDR_FORWARD_LIST
-#  define BOOST_NO_CXX11_HDR_FUTURE
-#  define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#  define BOOST_NO_CXX11_HDR_MUTEX
-#  define BOOST_NO_CXX11_HDR_RANDOM
-#  define BOOST_NO_CXX11_HDR_RATIO
-#  define BOOST_NO_CXX11_HDR_REGEX
-#  define BOOST_NO_CXX11_HDR_SYSTEM_ERROR
-#  define BOOST_NO_CXX11_HDR_THREAD
-#  define BOOST_NO_CXX11_HDR_TUPLE
-#  define BOOST_NO_CXX11_HDR_TYPE_TRAITS
-#  define BOOST_NO_CXX11_HDR_TYPEINDEX
-#  define BOOST_NO_CXX11_HDR_UNORDERED_MAP
-#  define BOOST_NO_CXX11_HDR_UNORDERED_SET
-#  define BOOST_NO_CXX11_NUMERIC_LIMITS
-#  define BOOST_NO_CXX11_ALLOCATOR
-#  define BOOST_NO_CXX11_ATOMIC_SMART_PTR
-#  define BOOST_NO_CXX11_SMART_PTR
-#  define BOOST_NO_CXX11_HDR_FUNCTIONAL
+#  define BOOST_NO_0X_HDR_ARRAY
+#  define BOOST_NO_0X_HDR_CHRONO
+#  define BOOST_NO_0X_HDR_CODECVT
+#  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  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_MUTEX
+#  define BOOST_NO_0X_HDR_RANDOM
+#  define BOOST_NO_0X_HDR_RATIO
+#  define BOOST_NO_0X_HDR_REGEX
+#  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
+#  define BOOST_NO_0X_HDR_UNORDERED_SET
+#  define BOOST_NO_NUMERIC_LIMITS_LOWEST

 #define BOOST_STDLIB "Metrowerks Standard Library version " BOOST_STRINGIZE(__MSL_CPP__)

--- a/include/boost/config/stdlib/roguewave.hpp
+++ b/include/boost/config/stdlib/roguewave.hpp
@@ -155,32 +155,29 @@
 #endif

 #if _RWSTD_VER < 0x05000000
-#  define BOOST_NO_CXX11_HDR_ARRAY
+#  define BOOST_NO_0X_HDR_ARRAY
 #endif
 // type_traits header is incomplete:
-#  define BOOST_NO_CXX11_HDR_TYPE_TRAITS
+#  define BOOST_NO_0X_HDR_TYPE_TRAITS
 //
 //  C++0x headers not yet implemented
 //
-#  define BOOST_NO_CXX11_HDR_CHRONO
-#  define BOOST_NO_CXX11_HDR_CODECVT
-#  define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_CXX11_HDR_FORWARD_LIST
-#  define BOOST_NO_CXX11_HDR_FUTURE
-#  define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#  define BOOST_NO_CXX11_HDR_MUTEX
-#  define BOOST_NO_CXX11_HDR_RANDOM
-#  define BOOST_NO_CXX11_HDR_RATIO
-#  define BOOST_NO_CXX11_HDR_REGEX
-#  define BOOST_NO_CXX11_HDR_SYSTEM_ERROR
-#  define BOOST_NO_CXX11_HDR_THREAD
-#  define BOOST_NO_CXX11_HDR_TUPLE
-#  define BOOST_NO_CXX11_HDR_TYPEINDEX
-#  define BOOST_NO_CXX11_HDR_UNORDERED_MAP
-#  define BOOST_NO_CXX11_HDR_UNORDERED_SET
-#  define BOOST_NO_CXX11_NUMERIC_LIMITS
-#  define BOOST_NO_CXX11_ALLOCATOR
-#  define BOOST_NO_CXX11_ATOMIC_SMART_PTR
-#  define BOOST_NO_CXX11_SMART_PTR
-#  define BOOST_NO_CXX11_HDR_FUNCTIONAL
+#  define BOOST_NO_0X_HDR_CHRONO
+#  define BOOST_NO_0X_HDR_CODECVT
+#  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  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_MUTEX
+#  define BOOST_NO_0X_HDR_RANDOM
+#  define BOOST_NO_0X_HDR_RATIO
+#  define BOOST_NO_0X_HDR_REGEX
+#  define BOOST_NO_0X_HDR_SYSTEM_ERROR
+#  define BOOST_NO_0X_HDR_THREAD
+#  define BOOST_NO_0X_HDR_TUPLE
+#  define BOOST_NO_0X_HDR_TYPEINDEX
+#  define BOOST_NO_STD_UNORDERED        // deprecated; see following
+#  define BOOST_NO_0X_HDR_UNORDERED_MAP
+#  define BOOST_NO_0X_HDR_UNORDERED_SET
+#  define BOOST_NO_NUMERIC_LIMITS_LOWEST

--- a/include/boost/config/stdlib/sgi.hpp
+++ b/include/boost/config/stdlib/sgi.hpp
@@ -118,29 +118,26 @@

 //  C++0x headers not yet implemented
 //
-#  define BOOST_NO_CXX11_HDR_ARRAY
-#  define BOOST_NO_CXX11_HDR_CHRONO
-#  define BOOST_NO_CXX11_HDR_CODECVT
-#  define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_CXX11_HDR_FORWARD_LIST
-#  define BOOST_NO_CXX11_HDR_FUTURE
-#  define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#  define BOOST_NO_CXX11_HDR_MUTEX
-#  define BOOST_NO_CXX11_HDR_RANDOM
-#  define BOOST_NO_CXX11_HDR_RATIO
-#  define BOOST_NO_CXX11_HDR_REGEX
-#  define BOOST_NO_CXX11_HDR_SYSTEM_ERROR
-#  define BOOST_NO_CXX11_HDR_THREAD
-#  define BOOST_NO_CXX11_HDR_TUPLE
-#  define BOOST_NO_CXX11_HDR_TYPE_TRAITS
-#  define BOOST_NO_CXX11_HDR_TYPEINDEX
-#  define BOOST_NO_CXX11_HDR_UNORDERED_MAP
-#  define BOOST_NO_CXX11_HDR_UNORDERED_SET
-#  define BOOST_NO_CXX11_NUMERIC_LIMITS
-#  define BOOST_NO_CXX11_ALLOCATOR
-#  define BOOST_NO_CXX11_ATOMIC_SMART_PTR
-#  define BOOST_NO_CXX11_SMART_PTR
-#  define BOOST_NO_CXX11_HDR_FUNCTIONAL
+#  define BOOST_NO_0X_HDR_ARRAY
+#  define BOOST_NO_0X_HDR_CHRONO
+#  define BOOST_NO_0X_HDR_CODECVT
+#  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  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_MUTEX
+#  define BOOST_NO_0X_HDR_RANDOM
+#  define BOOST_NO_0X_HDR_RATIO
+#  define BOOST_NO_0X_HDR_REGEX
+#  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
+#  define BOOST_NO_0X_HDR_UNORDERED_SET
+#  define BOOST_NO_NUMERIC_LIMITS_LOWEST

 #define BOOST_STDLIB "SGI standard library"

--- a/include/boost/config/stdlib/stlport.hpp
+++ b/include/boost/config/stdlib/stlport.hpp
@@ -71,6 +71,10 @@
 #  endif
 #endif

+#if defined(_STLPORT_VERSION) && ((_STLPORT_VERSION < 0x500) || (_STLPORT_VERSION >= 0x520))
+#  define BOOST_NO_STD_UNORDERED
+#endif
+
 #if defined(_STLPORT_VERSION) && (_STLPORT_VERSION >= 0x520)
 #  define BOOST_HAS_TR1_UNORDERED_SET
 #  define BOOST_HAS_TR1_UNORDERED_MAP
@@ -208,29 +212,26 @@ namespace boost { using std::min; using std::max; }

 //  C++0x headers not yet implemented
 //
-#  define BOOST_NO_CXX11_HDR_ARRAY
-#  define BOOST_NO_CXX11_HDR_CHRONO
-#  define BOOST_NO_CXX11_HDR_CODECVT
-#  define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_CXX11_HDR_FORWARD_LIST
-#  define BOOST_NO_CXX11_HDR_FUTURE
-#  define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#  define BOOST_NO_CXX11_HDR_MUTEX
-#  define BOOST_NO_CXX11_HDR_RANDOM
-#  define BOOST_NO_CXX11_HDR_RATIO
-#  define BOOST_NO_CXX11_HDR_REGEX
-#  define BOOST_NO_CXX11_HDR_SYSTEM_ERROR
-#  define BOOST_NO_CXX11_HDR_THREAD
-#  define BOOST_NO_CXX11_HDR_TUPLE
-#  define BOOST_NO_CXX11_HDR_TYPE_TRAITS
-#  define BOOST_NO_CXX11_HDR_TYPEINDEX
-#  define BOOST_NO_CXX11_HDR_UNORDERED_MAP
-#  define BOOST_NO_CXX11_HDR_UNORDERED_SET
-#  define BOOST_NO_CXX11_NUMERIC_LIMITS
-#  define BOOST_NO_CXX11_ALLOCATOR
-#  define BOOST_NO_CXX11_ATOMIC_SMART_PTR
-#  define BOOST_NO_CXX11_SMART_PTR
-#  define BOOST_NO_CXX11_HDR_FUNCTIONAL
+#  define BOOST_NO_0X_HDR_ARRAY
+#  define BOOST_NO_0X_HDR_CHRONO
+#  define BOOST_NO_0X_HDR_CODECVT
+#  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  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_MUTEX
+#  define BOOST_NO_0X_HDR_RANDOM
+#  define BOOST_NO_0X_HDR_RATIO
+#  define BOOST_NO_0X_HDR_REGEX
+#  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
+#  define BOOST_NO_0X_HDR_UNORDERED_SET
+#  define BOOST_NO_NUMERIC_LIMITS_LOWEST

 #define BOOST_STDLIB "STLPort standard library version " BOOST_STRINGIZE(__SGI_STL_PORT)

--- a/include/boost/config/stdlib/vacpp.hpp
+++ b/include/boost/config/stdlib/vacpp.hpp
@@ -24,29 +24,26 @@

 //  C++0x headers not yet implemented
 //
-#  define BOOST_NO_CXX11_HDR_ARRAY
-#  define BOOST_NO_CXX11_HDR_CHRONO
-#  define BOOST_NO_CXX11_HDR_CODECVT
-#  define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_CXX11_HDR_FORWARD_LIST
-#  define BOOST_NO_CXX11_HDR_FUTURE
-#  define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#  define BOOST_NO_CXX11_HDR_MUTEX
-#  define BOOST_NO_CXX11_HDR_RANDOM
-#  define BOOST_NO_CXX11_HDR_RATIO
-#  define BOOST_NO_CXX11_HDR_REGEX
-#  define BOOST_NO_CXX11_HDR_SYSTEM_ERROR
-#  define BOOST_NO_CXX11_HDR_THREAD
-#  define BOOST_NO_CXX11_HDR_TUPLE
-#  define BOOST_NO_CXX11_HDR_TYPE_TRAITS
-#  define BOOST_NO_CXX11_HDR_TYPEINDEX
-#  define BOOST_NO_CXX11_HDR_UNORDERED_MAP
-#  define BOOST_NO_CXX11_HDR_UNORDERED_SET
-#  define BOOST_NO_CXX11_NUMERIC_LIMITS
-#  define BOOST_NO_CXX11_ALLOCATOR
-#  define BOOST_NO_CXX11_ATOMIC_SMART_PTR
-#  define BOOST_NO_CXX11_SMART_PTR
-#  define BOOST_NO_CXX11_HDR_FUNCTIONAL
+#  define BOOST_NO_0X_HDR_ARRAY
+#  define BOOST_NO_0X_HDR_CHRONO
+#  define BOOST_NO_0X_HDR_CODECVT
+#  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  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_MUTEX
+#  define BOOST_NO_0X_HDR_RANDOM
+#  define BOOST_NO_0X_HDR_RATIO
+#  define BOOST_NO_0X_HDR_REGEX
+#  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
+#  define BOOST_NO_0X_HDR_UNORDERED_SET
+#  define BOOST_NO_NUMERIC_LIMITS_LOWEST

 #define BOOST_STDLIB "Visual Age default standard library"

--- a/include/boost/config/suffix.hpp
+++ b/include/boost/config/suffix.hpp
@@ -1,5 +1,4 @@
 //  Boost config.hpp configuration header file  ------------------------------//
-//	boostinspect:ndprecated_macros	-- tell the inspect tool to ignore this file

 //  Copyright (c) 2001-2003 John Maddock
 //  Copyright (c) 2001 Darin Adler
@@ -104,6 +103,13 @@
 #  define BOOST_NO_LONG_LONG_NUMERIC_LIMITS
 #endif

+//
+// Normalize BOOST_NO_STATIC_ASSERT and (depricated) BOOST_HAS_STATIC_ASSERT:
+//
+#if !defined(BOOST_NO_STATIC_ASSERT) && !defined(BOOST_HAS_STATIC_ASSERT)
+#  define BOOST_HAS_STATIC_ASSERT
+#endif
+
 //
 // if there is no __int64 then there is no specialisation
 // for numeric_limits<__int64> either:
@@ -328,6 +334,31 @@
 #  define BOOST_HASH_MAP_HEADER <hash_map>
 #endif

+//
+// Set BOOST_NO_INITIALIZER_LISTS if there is no library support.
+//
+
+#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
+//
+#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_HAS_RVALUE_REFS)
+#define BOOST_HAS_RVALUE_REFS
+#endif
+
+//
+// Set BOOST_HAS_VARIADIC_TMPL when BOOST_NO_VARIADIC_TEMPLATES is not defined
+//
+#if !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_HAS_VARIADIC_TMPL)
+#define BOOST_HAS_VARIADIC_TMPL
+#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:
@@ -489,18 +520,6 @@ namespace boost{
 #  endif
 }
 #endif
-// same again for __int128:
-#if defined(BOOST_HAS_INT128) && defined(__cplusplus)
-namespace boost{
-#  ifdef __GNUC__
-   __extension__ typedef __int128 int128_type;
-   __extension__ typedef unsigned __int128 uint128_type;
-#  else
-   typedef __int128 int128_type;
-   typedef unsigned __int128 uint128_type;
-#  endif
-}
-#endif

 // BOOST_[APPEND_]EXPLICIT_TEMPLATE_[NON_]TYPE macros --------------------------//
 //
@@ -635,270 +654,10 @@ namespace std{ using ::type_info; }
 #  define BOOST_GPU_ENABLED 
 #  endif

-// 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
-     // Clang also defines __GNUC__ (as 4)
-#    define BOOST_FORCEINLINE inline __attribute__ ((__always_inline__))
-#  else
-#    define BOOST_FORCEINLINE inline
-#  endif
-#endif
-
-//
-// Set BOOST_NO_DECLTYPE_N3276 when BOOST_NO_DECLTYPE is defined
-//
-#if defined(BOOST_NO_CXX11_DECLTYPE) && !defined(BOOST_NO_CXX11_DECLTYPE_N3276)
-#define	BOOST_NO_CXX11_DECLTYPE_N3276 BOOST_NO_CXX11_DECLTYPE
-#endif
-
-//  -------------------- Deprecated macros for 1.50 ---------------------------
-//  These will go away in a future release
-
-//  Use BOOST_NO_CXX11_HDR_UNORDERED_SET or BOOST_NO_CXX11_HDR_UNORDERED_MAP
-//           instead of BOOST_NO_STD_UNORDERED
-#if defined(BOOST_NO_CXX11_HDR_UNORDERED_MAP) || defined (BOOST_NO_CXX11_HDR_UNORDERED_SET)
-# ifndef BOOST_NO_CXX11_STD_UNORDERED
-#  define BOOST_NO_CXX11_STD_UNORDERED
-# endif
-#endif
-
-//  Use BOOST_NO_CXX11_HDR_INITIALIZER_LIST instead of BOOST_NO_INITIALIZER_LISTS
-#if defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) && !defined(BOOST_NO_INITIALIZER_LISTS)
-#  define BOOST_NO_INITIALIZER_LISTS
-#endif
-
-//  Use BOOST_NO_CXX11_HDR_ARRAY instead of BOOST_NO_0X_HDR_ARRAY
-#if defined(BOOST_NO_CXX11_HDR_ARRAY) && !defined(BOOST_NO_0X_HDR_ARRAY)
-#  define BOOST_NO_0X_HDR_ARRAY
-#endif
-//  Use BOOST_NO_CXX11_HDR_CHRONO instead of BOOST_NO_0X_HDR_CHRONO
-#if defined(BOOST_NO_CXX11_HDR_CHRONO) && !defined(BOOST_NO_0X_HDR_CHRONO)
-#  define BOOST_NO_0X_HDR_CHRONO
-#endif
-//  Use BOOST_NO_CXX11_HDR_CODECVT instead of BOOST_NO_0X_HDR_CODECVT
-#if defined(BOOST_NO_CXX11_HDR_CODECVT) && !defined(BOOST_NO_0X_HDR_CODECVT)
-#  define BOOST_NO_0X_HDR_CODECVT
-#endif
-//  Use BOOST_NO_CXX11_HDR_CONDITION_VARIABLE instead of BOOST_NO_0X_HDR_CONDITION_VARIABLE
-#if defined(BOOST_NO_CXX11_HDR_CONDITION_VARIABLE) && !defined(BOOST_NO_0X_HDR_CONDITION_VARIABLE)
-#  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
-#endif
-//  Use BOOST_NO_CXX11_HDR_FORWARD_LIST instead of BOOST_NO_0X_HDR_FORWARD_LIST
-#if defined(BOOST_NO_CXX11_HDR_FORWARD_LIST) && !defined(BOOST_NO_0X_HDR_FORWARD_LIST)
-#  define BOOST_NO_0X_HDR_FORWARD_LIST
-#endif
-//  Use BOOST_NO_CXX11_HDR_FUTURE instead of BOOST_NO_0X_HDR_FUTURE
-#if defined(BOOST_NO_CXX11_HDR_FUTURE) && !defined(BOOST_NO_0X_HDR_FUTURE)
-#  define BOOST_NO_0X_HDR_FUTURE
-#endif
-
-//  Use BOOST_NO_CXX11_HDR_INITIALIZER_LIST 
-//  instead of BOOST_NO_0X_HDR_INITIALIZER_LIST or BOOST_NO_INITIALIZER_LISTS
-#ifdef BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-# ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST
-#  define BOOST_NO_0X_HDR_INITIALIZER_LIST
-# endif
-# ifndef BOOST_NO_INITIALIZER_LISTS
-#  define BOOST_NO_INITIALIZER_LISTS
-# endif
-#endif
-
-//  Use BOOST_NO_CXX11_HDR_MUTEX instead of BOOST_NO_0X_HDR_MUTEX
-#if defined(BOOST_NO_CXX11_HDR_MUTEX) && !defined(BOOST_NO_0X_HDR_MUTEX)
-#  define BOOST_NO_0X_HDR_MUTEX
-#endif
-//  Use BOOST_NO_CXX11_HDR_RANDOM instead of BOOST_NO_0X_HDR_RANDOM
-#if defined(BOOST_NO_CXX11_HDR_RANDOM) && !defined(BOOST_NO_0X_HDR_RANDOM)
-#  define BOOST_NO_0X_HDR_RANDOM
-#endif
-//  Use BOOST_NO_CXX11_HDR_RATIO instead of BOOST_NO_0X_HDR_RATIO
-#if defined(BOOST_NO_CXX11_HDR_RATIO) && !defined(BOOST_NO_0X_HDR_RATIO)
-#  define BOOST_NO_0X_HDR_RATIO
-#endif
-//  Use BOOST_NO_CXX11_HDR_REGEX instead of BOOST_NO_0X_HDR_REGEX
-#if defined(BOOST_NO_CXX11_HDR_REGEX) && !defined(BOOST_NO_0X_HDR_REGEX)
-#  define BOOST_NO_0X_HDR_REGEX
-#endif
-//  Use BOOST_NO_CXX11_HDR_SYSTEM_ERROR instead of BOOST_NO_0X_HDR_SYSTEM_ERROR
-#if defined(BOOST_NO_CXX11_HDR_SYSTEM_ERROR) && !defined(BOOST_NO_0X_HDR_SYSTEM_ERROR)
-#  define BOOST_NO_0X_HDR_SYSTEM_ERROR
-#endif
-//  Use BOOST_NO_CXX11_HDR_THREAD instead of BOOST_NO_0X_HDR_THREAD
-#if defined(BOOST_NO_CXX11_HDR_THREAD) && !defined(BOOST_NO_0X_HDR_THREAD)
-#  define BOOST_NO_0X_HDR_THREAD
-#endif
-//  Use BOOST_NO_CXX11_HDR_TUPLE instead of BOOST_NO_0X_HDR_TUPLE
-#if defined(BOOST_NO_CXX11_HDR_TUPLE) && !defined(BOOST_NO_0X_HDR_TUPLE)
-#  define BOOST_NO_0X_HDR_TUPLE
-#endif
-//  Use BOOST_NO_CXX11_HDR_TYPE_TRAITS instead of BOOST_NO_0X_HDR_TYPE_TRAITS
-#if defined(BOOST_NO_CXX11_HDR_TYPE_TRAITS) && !defined(BOOST_NO_0X_HDR_TYPE_TRAITS)
-#  define BOOST_NO_0X_HDR_TYPE_TRAITS
-#endif
-//  Use BOOST_NO_CXX11_HDR_TYPEINDEX instead of BOOST_NO_0X_HDR_TYPEINDEX
-#if defined(BOOST_NO_CXX11_HDR_TYPEINDEX) && !defined(BOOST_NO_0X_HDR_TYPEINDEX)
-#  define BOOST_NO_0X_HDR_TYPEINDEX
-#endif
-//  Use BOOST_NO_CXX11_HDR_UNORDERED_MAP instead of BOOST_NO_0X_HDR_UNORDERED_MAP
-#if defined(BOOST_NO_CXX11_HDR_UNORDERED_MAP) && !defined(BOOST_NO_0X_HDR_UNORDERED_MAP)
-#  define BOOST_NO_0X_HDR_UNORDERED_MAP
-#endif
-//  Use BOOST_NO_CXX11_HDR_UNORDERED_SET instead of BOOST_NO_0X_HDR_UNORDERED_SET
-#if defined(BOOST_NO_CXX11_HDR_UNORDERED_SET) && !defined(BOOST_NO_0X_HDR_UNORDERED_SET)
-#  define BOOST_NO_0X_HDR_UNORDERED_SET
-#endif
-
-//  ------------------ End of deprecated macros for 1.50 ---------------------------
-
-//  -------------------- Deprecated macros for 1.51 ---------------------------
-//  These will go away in a future release
-
-//  Use     BOOST_NO_CXX11_AUTO_DECLARATIONS instead of   BOOST_NO_AUTO_DECLARATIONS
-#if defined(BOOST_NO_CXX11_AUTO_DECLARATIONS) && !defined(BOOST_NO_AUTO_DECLARATIONS)
-#  define BOOST_NO_AUTO_DECLARATIONS
-#endif
-//  Use     BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS instead of   BOOST_NO_AUTO_MULTIDECLARATIONS
-#if defined(BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS) && !defined(BOOST_NO_AUTO_MULTIDECLARATIONS)
-#  define BOOST_NO_AUTO_MULTIDECLARATIONS
-#endif
-//  Use     BOOST_NO_CXX11_CHAR16_T instead of   BOOST_NO_CHAR16_T
-#if defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CHAR16_T)
-#  define BOOST_NO_CHAR16_T
-#endif
-//  Use     BOOST_NO_CXX11_CHAR32_T instead of   BOOST_NO_CHAR32_T
-#if defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CHAR32_T)
-#  define BOOST_NO_CHAR32_T
-#endif
-//  Use     BOOST_NO_CXX11_TEMPLATE_ALIASES instead of   BOOST_NO_TEMPLATE_ALIASES
-#if defined(BOOST_NO_CXX11_TEMPLATE_ALIASES) && !defined(BOOST_NO_TEMPLATE_ALIASES)
-#  define BOOST_NO_TEMPLATE_ALIASES
-#endif
-//  Use     BOOST_NO_CXX11_CONSTEXPR instead of   BOOST_NO_CONSTEXPR
-#if defined(BOOST_NO_CXX11_CONSTEXPR) && !defined(BOOST_NO_CONSTEXPR)
-#  define BOOST_NO_CONSTEXPR
-#endif
-//  Use     BOOST_NO_CXX11_DECLTYPE_N3276 instead of   BOOST_NO_DECLTYPE_N3276
-#if defined(BOOST_NO_CXX11_DECLTYPE_N3276) && !defined(BOOST_NO_DECLTYPE_N3276)
-#  define BOOST_NO_DECLTYPE_N3276
-#endif
-//  Use     BOOST_NO_CXX11_DECLTYPE instead of   BOOST_NO_DECLTYPE
-#if defined(BOOST_NO_CXX11_DECLTYPE) && !defined(BOOST_NO_DECLTYPE)
-#  define BOOST_NO_DECLTYPE
-#endif
-//  Use     BOOST_NO_CXX11_DEFAULTED_FUNCTIONS instead of   BOOST_NO_DEFAULTED_FUNCTIONS
-#if defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && !defined(BOOST_NO_DEFAULTED_FUNCTIONS)
-#  define BOOST_NO_DEFAULTED_FUNCTIONS
-#endif
-//  Use     BOOST_NO_CXX11_DELETED_FUNCTIONS instead of   BOOST_NO_DELETED_FUNCTIONS
-#if defined(BOOST_NO_CXX11_DELETED_FUNCTIONS) && !defined(BOOST_NO_DELETED_FUNCTIONS)
-#  define BOOST_NO_DELETED_FUNCTIONS
-#endif
-//  Use     BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS instead of   BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-#if defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS) && !defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS)
-#  define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-#endif
-//  Use     BOOST_NO_CXX11_EXTERN_TEMPLATE instead of   BOOST_NO_EXTERN_TEMPLATE
-#if defined(BOOST_NO_CXX11_EXTERN_TEMPLATE) && !defined(BOOST_NO_EXTERN_TEMPLATE)
-#  define BOOST_NO_EXTERN_TEMPLATE
-#endif
-//  Use     BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS instead of   BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#if defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS) && !defined(BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS)
-#  define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#endif
-//  Use     BOOST_NO_CXX11_LAMBDAS instead of   BOOST_NO_LAMBDAS
-#if defined(BOOST_NO_CXX11_LAMBDAS) && !defined(BOOST_NO_LAMBDAS)
-#  define BOOST_NO_LAMBDAS
-#endif
-//  Use     BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS instead of   BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#if defined(BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS) && !defined(BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS)
-#  define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#endif
-//  Use     BOOST_NO_CXX11_NOEXCEPT instead of   BOOST_NO_NOEXCEPT
-#if defined(BOOST_NO_CXX11_NOEXCEPT) && !defined(BOOST_NO_NOEXCEPT)
-#  define BOOST_NO_NOEXCEPT
-#endif
-//  Use     BOOST_NO_CXX11_NULLPTR instead of   BOOST_NO_NULLPTR
-#if defined(BOOST_NO_CXX11_NULLPTR) && !defined(BOOST_NO_NULLPTR)
-#  define BOOST_NO_NULLPTR
-#endif
-//  Use     BOOST_NO_CXX11_RAW_LITERALS instead of   BOOST_NO_RAW_LITERALS
-#if defined(BOOST_NO_CXX11_RAW_LITERALS) && !defined(BOOST_NO_RAW_LITERALS)
-#  define BOOST_NO_RAW_LITERALS
-#endif
-//  Use     BOOST_NO_CXX11_RVALUE_REFERENCES instead of   BOOST_NO_RVALUE_REFERENCES
-#if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_RVALUE_REFERENCES)
-#  define BOOST_NO_RVALUE_REFERENCES
-#endif
-//  Use     BOOST_NO_CXX11_SCOPED_ENUMS instead of   BOOST_NO_SCOPED_ENUMS
-#if defined(BOOST_NO_CXX11_SCOPED_ENUMS) && !defined(BOOST_NO_SCOPED_ENUMS)
-#  define BOOST_NO_SCOPED_ENUMS
-#endif
-//  Use     BOOST_NO_CXX11_STATIC_ASSERT instead of   BOOST_NO_STATIC_ASSERT
-#if defined(BOOST_NO_CXX11_STATIC_ASSERT) && !defined(BOOST_NO_STATIC_ASSERT)
-#  define BOOST_NO_STATIC_ASSERT
-#endif
-//  Use     BOOST_NO_CXX11_STD_UNORDERED instead of   BOOST_NO_STD_UNORDERED
-#if defined(BOOST_NO_CXX11_STD_UNORDERED) && !defined(BOOST_NO_STD_UNORDERED)
-#  define BOOST_NO_STD_UNORDERED
-#endif
-//  Use     BOOST_NO_CXX11_UNICODE_LITERALS instead of   BOOST_NO_UNICODE_LITERALS
-#if defined(BOOST_NO_CXX11_UNICODE_LITERALS) && !defined(BOOST_NO_UNICODE_LITERALS)
-#  define BOOST_NO_UNICODE_LITERALS
-#endif
-//  Use     BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX instead of   BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
-#if defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) && !defined(BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX)
-#  define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
-#endif
-//  Use     BOOST_NO_CXX11_VARIADIC_TEMPLATES instead of   BOOST_NO_VARIADIC_TEMPLATES
-#if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_VARIADIC_TEMPLATES)
-#  define BOOST_NO_VARIADIC_TEMPLATES
-#endif
-//  Use     BOOST_NO_CXX11_VARIADIC_MACROS instead of   BOOST_NO_VARIADIC_MACROS
-#if defined(BOOST_NO_CXX11_VARIADIC_MACROS) && !defined(BOOST_NO_VARIADIC_MACROS)
-#  define BOOST_NO_VARIADIC_MACROS
-#endif
-//  Use     BOOST_NO_CXX11_NUMERIC_LIMITS instead of   BOOST_NO_NUMERIC_LIMITS_LOWEST
-#if defined(BOOST_NO_CXX11_NUMERIC_LIMITS) && !defined(BOOST_NO_NUMERIC_LIMITS_LOWEST)
-#  define BOOST_NO_NUMERIC_LIMITS_LOWEST
-#endif
-//  ------------------ End of deprecated macros for 1.51 ---------------------------
-
-
-
-//
-// 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_CXX11_NOEXCEPT
-#  define BOOST_NOEXCEPT
-#  define BOOST_NOEXCEPT_OR_NOTHROW throw()
-#  define BOOST_NOEXCEPT_IF(Predicate)
-#  define BOOST_NOEXCEPT_EXPR(Expression) false
-#else
-#  define BOOST_NOEXCEPT noexcept
-#  define BOOST_NOEXCEPT_OR_NOTHROW noexcept
-#  define BOOST_NOEXCEPT_IF(Predicate) noexcept((Predicate))
-#  define BOOST_NOEXCEPT_EXPR(Expression) noexcept((Expression))
-#endif
-//
-// Helper macro BOOST_FALLTHROUGH 
-// Fallback definition of BOOST_FALLTHROUGH macro used to mark intended 
-// fall-through between case labels in a switch statement. We use a definition 
-// that requires a semicolon after it to avoid at least one type of misuse even 
-// on unsupported compilers. 
-// 
-#ifndef BOOST_FALLTHROUGH 
-#  define BOOST_FALLTHROUGH ((void)0) 
-#endif 
-
 //
 // constexpr workarounds
 // 
-#if defined(BOOST_NO_CXX11_CONSTEXPR)
+#if defined(BOOST_NO_CONSTEXPR)
 #define BOOST_CONSTEXPR
 #define BOOST_CONSTEXPR_OR_CONST const
 #else
@@ -908,26 +667,5 @@ namespace std{ using ::type_info; }

 #define BOOST_STATIC_CONSTEXPR  static BOOST_CONSTEXPR_OR_CONST

-//
-// Set BOOST_HAS_STATIC_ASSERT when BOOST_NO_CXX11_STATIC_ASSERT is not defined
-//
-#if !defined(BOOST_NO_CXX11_STATIC_ASSERT) && !defined(BOOST_HAS_STATIC_ASSERT)
-#  define BOOST_HAS_STATIC_ASSERT
 #endif

-//
-// Set BOOST_HAS_RVALUE_REFS when BOOST_NO_CXX11_RVALUE_REFERENCES is not defined
-//
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_HAS_RVALUE_REFS)
-#define BOOST_HAS_RVALUE_REFS
-#endif
-
-//
-// Set BOOST_HAS_VARIADIC_TMPL when BOOST_NO_CXX11_VARIADIC_TEMPLATES is not defined
-//
-#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_HAS_VARIADIC_TMPL)
-#define BOOST_HAS_VARIADIC_TMPL
-#endif
-
-
-#endif
--- a/include/boost/limits.hpp
+++ b/include/boost/limits.hpp
@@ -14,7 +14,7 @@
 #include <boost/config.hpp>

 #ifdef BOOST_NO_LIMITS
-#  error "There is no std::numeric_limits suppport available."
+# include <boost/detail/limits.hpp>
 #else
 # include <limits>
 #endif
--- 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 105400
+#define BOOST_VERSION 104700

 //
 //  BOOST_LIB_VERSION must be defined to be the same as BOOST_VERSION
@@ -27,6 +27,9 @@
 //  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_54"
+#define BOOST_LIB_VERSION "1_47"

 #endif
+
+
+
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -1,19 +1,13 @@
 #
 # Copyright John Maddock 2008.
-# Use, modification and distribution are subject to the
-# Boost Software License, Version 1.0. (See accompanying file
+# 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)
 #
 # If you need to alter build preferences then set them in
 # the template defined in options_v2.jam.
 #

-project
-    : requirements
-      <toolset>gcc:<cxxflags>-Wno-deprecated-declarations
-;
-
-
 import modules ;

 local is_unix = [ modules.peek : UNIX ] ;
@@ -30,20 +24,20 @@ if $(is_unix)
 }

 test-suite config
-  :
+  : 
    [ compile config_test_c.c ]
-    [ run config_test.cpp
+    [ run config_test.cpp 
          : #args
          : #input-files
          : #requirements
          <threading>multi
          : config_test_threaded
    ]
-    [ run config_test.cpp
+    [ run config_test.cpp 
          : #args
          : #input-files
          : #requirements
-          <threading>single <toolset>msvc:<runtime-link>static <toolset>msvc:<link>static
+          <threading>single <toolset>msvc:<runtime-link>static <toolset>msvc:<link>static 
          <target-os>linux:<linkflags>-lpthread
          <target-os>linux:<linkflags>-lrt
          <toolset>gcc:<linkflags>$(OTHERFLAGS)
@@ -65,5 +59,4 @@ test-suite config
    ]
    [ compile-fail threads/test_thread_fail1.cpp ]
    [ compile-fail threads/test_thread_fail2.cpp ]
-    [ compile boost_fallthrough_test.cpp : <toolset>clang:<cxxflags>"-std=c++11 -Wimplicit-fallthrough" <warnings-as-errors>on <warnings>all ]
  ;
--- 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 Sun Apr 28 18:36:49 2013
+# This file was automatically generated on Mon May 09 12:11:18 2011
 #  by libs/config/tools/generate.cpp
 # Copyright John Maddock.
 # Use, modification and distribution are subject to the 
@@ -40,18 +40,12 @@ 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 ] ;
 test-suite "BOOST_HAS_HASH" : 
 [ run ../has_hash_pass.cpp ]
 [ compile-fail ../has_hash_fail.cpp ] ;
-test-suite "BOOST_HAS_INT128" : 
-[ run ../has_int128_pass.cpp ]
-[ compile-fail ../has_int128_fail.cpp ] ;
 test-suite "BOOST_HAS_LOG1P" : 
 [ run ../has_log1p_pass.cpp ]
 [ compile-fail ../has_log1p_fail.cpp ] ;
@@ -178,6 +172,60 @@ test-suite "BOOST_MSVC_STD_ITERATOR" :
 test-suite "BOOST_HAS_WINTHREADS" : 
 [ run ../has_winthreads_pass.cpp ]
 [ compile-fail ../has_winthreads_fail.cpp ] ;
+test-suite "BOOST_NO_0X_HDR_ARRAY" : 
+[ run ../no_0x_hdr_array_pass.cpp ]
+[ compile-fail ../no_0x_hdr_array_fail.cpp ] ;
+test-suite "BOOST_NO_0X_HDR_CHRONO" : 
+[ run ../no_0x_hdr_chrono_pass.cpp ]
+[ compile-fail ../no_0x_hdr_chrono_fail.cpp ] ;
+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_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_FORWARD_LIST" : 
+[ run ../no_0x_hdr_forward_list_pass.cpp ]
+[ compile-fail ../no_0x_hdr_forward_list_fail.cpp ] ;
+test-suite "BOOST_NO_0X_HDR_FUTURE" : 
+[ run ../no_0x_hdr_future_pass.cpp ]
+[ compile-fail ../no_0x_hdr_future_fail.cpp ] ;
+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_MUTEX" : 
+[ run ../no_0x_hdr_mutex_pass.cpp ]
+[ compile-fail ../no_0x_hdr_mutex_fail.cpp ] ;
+test-suite "BOOST_NO_0X_HDR_RANDOM" : 
+[ run ../no_0x_hdr_random_pass.cpp ]
+[ compile-fail ../no_0x_hdr_random_fail.cpp ] ;
+test-suite "BOOST_NO_0X_HDR_RATIO" : 
+[ run ../no_0x_hdr_ratio_pass.cpp ]
+[ compile-fail ../no_0x_hdr_ratio_fail.cpp ] ;
+test-suite "BOOST_NO_0X_HDR_REGEX" : 
+[ run ../no_0x_hdr_regex_pass.cpp ]
+[ compile-fail ../no_0x_hdr_regex_fail.cpp ] ;
+test-suite "BOOST_NO_0X_HDR_SYSTEM_ERROR" : 
+[ run ../no_0x_hdr_system_error_pass.cpp ]
+[ compile-fail ../no_0x_hdr_system_error_fail.cpp ] ;
+test-suite "BOOST_NO_0X_HDR_THREAD" : 
+[ run ../no_0x_hdr_thread_pass.cpp ]
+[ compile-fail ../no_0x_hdr_thread_fail.cpp ] ;
+test-suite "BOOST_NO_0X_HDR_TUPLE" : 
+[ run ../no_0x_hdr_tuple_pass.cpp ]
+[ compile-fail ../no_0x_hdr_tuple_fail.cpp ] ;
+test-suite "BOOST_NO_0X_HDR_TYPEINDEX" : 
+[ run ../no_0x_hdr_typeindex_pass.cpp ]
+[ compile-fail ../no_0x_hdr_typeindex_fail.cpp ] ;
+test-suite "BOOST_NO_0X_HDR_TYPE_TRAITS" : 
+[ run ../no_0x_hdr_type_traits_pass.cpp ]
+[ compile-fail ../no_0x_hdr_type_traits_fail.cpp ] ;
+test-suite "BOOST_NO_0X_HDR_UNORDERED_MAP" : 
+[ run ../no_0x_hdr_unordered_map_pass.cpp ]
+[ compile-fail ../no_0x_hdr_unordered_map_fail.cpp ] ;
+test-suite "BOOST_NO_0X_HDR_UNORDERED_SET" : 
+[ run ../no_0x_hdr_unordered_set_pass.cpp ]
+[ compile-fail ../no_0x_hdr_unordered_set_fail.cpp ] ;
 test-suite "BOOST_NO_ADL_BARRIER" : 
 [ run ../no_adl_barrier_pass.cpp ]
 [ compile-fail ../no_adl_barrier_fail.cpp ] ;
@@ -187,10 +235,10 @@ test-suite "BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP" :
 test-suite "BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS" : 
 [ run ../no_array_type_spec_pass.cpp ]
 [ compile-fail ../no_array_type_spec_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_AUTO_DECLARATIONS" : 
+test-suite "BOOST_NO_AUTO_DECLARATIONS" : 
 [ run ../no_auto_declarations_pass.cpp ]
 [ compile-fail ../no_auto_declarations_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS" : 
+test-suite "BOOST_NO_AUTO_MULTIDECLARATIONS" : 
 [ run ../no_auto_multidecl_pass.cpp ]
 [ compile-fail ../no_auto_multidecl_fail.cpp ] ;
 test-suite "BOOST_NO_AUTO_PTR" : 
@@ -199,16 +247,16 @@ test-suite "BOOST_NO_AUTO_PTR" :
 test-suite "BOOST_BCB_PARTIAL_SPECIALIZATION_BUG" : 
 [ run ../no_bcb_partial_spec_pass.cpp ]
 [ compile-fail ../no_bcb_partial_spec_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_CHAR16_T" : 
+test-suite "BOOST_NO_CHAR16_T" : 
 [ run ../no_char16_t_pass.cpp ]
 [ compile-fail ../no_char16_t_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_CHAR32_T" : 
+test-suite "BOOST_NO_CHAR32_T" : 
 [ run ../no_char32_t_pass.cpp ]
 [ compile-fail ../no_char32_t_fail.cpp ] ;
 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_CXX11_CONSTEXPR" : 
+test-suite "BOOST_NO_CONSTEXPR" : 
 [ run ../no_constexpr_pass.cpp ]
 [ compile-fail ../no_constexpr_fail.cpp ] ;
 test-suite "BOOST_NO_CTYPE_FUNCTIONS" : 
@@ -226,91 +274,16 @@ test-suite "BOOST_NO_CWCHAR" :
 test-suite "BOOST_NO_CWCTYPE" : 
 [ run ../no_cwctype_pass.cpp ]
 [ compile-fail ../no_cwctype_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_ALLOCATOR" : 
-[ run ../no_cxx11_allocator_pass.cpp ]
-[ compile-fail ../no_cxx11_allocator_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_ATOMIC_SMART_PTR" : 
-[ run ../no_cxx11_atomic_sp_pass.cpp ]
-[ compile-fail ../no_cxx11_atomic_sp_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_ARRAY" : 
-[ run ../no_cxx11_hdr_array_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_array_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_CHRONO" : 
-[ run ../no_cxx11_hdr_chrono_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_chrono_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_CODECVT" : 
-[ run ../no_cxx11_hdr_codecvt_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_codecvt_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_CONDITION_VARIABLE" : 
-[ run ../no_cxx11_hdr_condition_variable_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_condition_variable_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_FORWARD_LIST" : 
-[ run ../no_cxx11_hdr_forward_list_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_forward_list_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_FUTURE" : 
-[ run ../no_cxx11_hdr_future_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_future_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_INITIALIZER_LIST" : 
-[ run ../no_cxx11_hdr_initializer_list_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_initializer_list_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_MUTEX" : 
-[ run ../no_cxx11_hdr_mutex_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_mutex_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_RANDOM" : 
-[ run ../no_cxx11_hdr_random_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_random_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_RATIO" : 
-[ run ../no_cxx11_hdr_ratio_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_ratio_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_REGEX" : 
-[ run ../no_cxx11_hdr_regex_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_regex_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_SYSTEM_ERROR" : 
-[ run ../no_cxx11_hdr_system_error_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_system_error_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_THREAD" : 
-[ run ../no_cxx11_hdr_thread_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_thread_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_TUPLE" : 
-[ run ../no_cxx11_hdr_tuple_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_tuple_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_TYPEINDEX" : 
-[ run ../no_cxx11_hdr_typeindex_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_typeindex_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_TYPE_TRAITS" : 
-[ run ../no_cxx11_hdr_type_traits_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_type_traits_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_UNORDERED_MAP" : 
-[ run ../no_cxx11_hdr_unordered_map_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_unordered_map_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_UNORDERED_SET" : 
-[ run ../no_cxx11_hdr_unordered_set_pass.cpp ]
-[ compile-fail ../no_cxx11_hdr_unordered_set_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_NUMERIC_LIMITS" : 
-[ run ../no_cxx11_numeric_limits_pass.cpp ]
-[ compile-fail ../no_cxx11_numeric_limits_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_SMART_PTR" : 
-[ run ../no_cxx11_smart_ptr_pass.cpp ]
-[ compile-fail ../no_cxx11_smart_ptr_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_USER_DEFINED_LITERALS" : 
-[ run ../no_cxx11_user_lit_pass.cpp ]
-[ compile-fail ../no_cxx11_user_lit_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_HDR_FUNCTIONAL" : 
-[ run ../no_cxx_hdr_functional_pass.cpp ]
-[ compile-fail ../no_cxx_hdr_functional_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_DECLTYPE" : 
+test-suite "BOOST_NO_DECLTYPE" : 
 [ run ../no_decltype_pass.cpp ]
 [ compile-fail ../no_decltype_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_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 ] ;
-test-suite "BOOST_NO_CXX11_DEFAULTED_FUNCTIONS" : 
+test-suite "BOOST_NO_DEFAULTED_FUNCTIONS" : 
 [ run ../no_defaulted_functions_pass.cpp ]
 [ compile-fail ../no_defaulted_functions_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_DELETED_FUNCTIONS" : 
+test-suite "BOOST_NO_DELETED_FUNCTIONS" : 
 [ run ../no_deleted_functions_pass.cpp ]
 [ compile-fail ../no_deleted_functions_fail.cpp ] ;
 test-suite "BOOST_NO_DEPENDENT_NESTED_DERIVATIONS" : 
@@ -325,19 +298,19 @@ test-suite "BOOST_NO_EXCEPTIONS" :
 test-suite "BOOST_NO_EXCEPTION_STD_NAMESPACE" : 
 [ run ../no_excep_std_pass.cpp ]
 [ compile-fail ../no_excep_std_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS" : 
+test-suite "BOOST_NO_EXPLICIT_CONVERSION_OPERATORS" : 
 [ run ../no_explicit_cvt_ops_pass.cpp ]
 [ compile-fail ../no_explicit_cvt_ops_fail.cpp ] ;
 test-suite "BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS" : 
 [ run ../no_exp_func_tem_arg_pass.cpp ]
 [ compile-fail ../no_exp_func_tem_arg_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_EXTERN_TEMPLATE" : 
+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_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS" : 
+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 ] ;
 test-suite "BOOST_NO_FUNCTION_TYPE_SPECIALIZATIONS" : 
@@ -349,6 +322,9 @@ test-suite "BOOST_NO_FUNCTION_TEMPLATE_ORDERING" :
 test-suite "BOOST_NO_MS_INT64_NUMERIC_LIMITS" : 
 [ run ../no_i64_limits_pass.cpp ]
 [ compile-fail ../no_i64_limits_fail.cpp ] ;
+test-suite "BOOST_NO_INITIALIZER_LISTS" : 
+[ run ../no_initializer_lists_pass.cpp ]
+[ compile-fail ../no_initializer_lists_fail.cpp ] ;
 test-suite "BOOST_NO_INCLASS_MEMBER_INITIALIZATION" : 
 [ run ../no_inline_memb_init_pass.cpp ]
 [ compile-fail ../no_inline_memb_init_fail.cpp ] ;
@@ -367,7 +343,7 @@ test-suite "BOOST_NO_IS_ABSTRACT" :
 test-suite "BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS" : 
 [ run ../no_iter_construct_pass.cpp ]
 [ compile-fail ../no_iter_construct_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_LAMBDAS" : 
+test-suite "BOOST_NO_LAMBDAS" : 
 [ run ../no_lambdas_pass.cpp ]
 [ compile-fail ../no_lambdas_fail.cpp ] ;
 test-suite "BOOST_NO_LIMITS" : 
@@ -376,6 +352,9 @@ test-suite "BOOST_NO_LIMITS" :
 test-suite "BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS" : 
 [ run ../no_limits_const_exp_pass.cpp ]
 [ compile-fail ../no_limits_const_exp_fail.cpp ] ;
+test-suite "BOOST_NO_NUMERIC_LIMITS_LOWEST" : 
+[ run ../no_limits_lowest_pass.cpp ]
+[ compile-fail ../no_limits_lowest_fail.cpp ] ;
 test-suite "BOOST_NO_LONG_LONG_NUMERIC_LIMITS" : 
 [ run ../no_ll_limits_pass.cpp ]
 [ compile-fail ../no_ll_limits_fail.cpp ] ;
@@ -400,10 +379,10 @@ 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_CXX11_NOEXCEPT" : 
+test-suite "BOOST_NO_NOEXCEPT" : 
 [ run ../no_noexcept_pass.cpp ]
 [ compile-fail ../no_noexcept_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_NULLPTR" : 
+test-suite "BOOST_NO_NULLPTR" : 
 [ run ../no_nullptr_pass.cpp ]
 [ compile-fail ../no_nullptr_fail.cpp ] ;
 test-suite "BOOST_NO_OPERATORS_IN_NAMESPACE" : 
@@ -421,10 +400,7 @@ test-suite "BOOST_NO_PRIVATE_IN_AGGREGATE" :
 test-suite "BOOST_NO_POINTER_TO_MEMBER_CONST" : 
 [ run ../no_ptr_mem_const_pass.cpp ]
 [ compile-fail ../no_ptr_mem_const_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_RANGE_BASED_FOR" : 
-[ run ../no_range_based_for_pass.cpp ]
-[ compile-fail ../no_range_based_for_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_RAW_LITERALS" : 
+test-suite "BOOST_NO_RAW_LITERALS" : 
 [ run ../no_raw_literals_pass.cpp ]
 [ compile-fail ../no_raw_literals_fail.cpp ] ;
 test-suite "BOOST_NO_UNREACHABLE_RETURN_DETECTION" : 
@@ -433,10 +409,10 @@ test-suite "BOOST_NO_UNREACHABLE_RETURN_DETECTION" :
 test-suite "BOOST_NO_RTTI" : 
 [ run ../no_rtti_pass.cpp ]
 [ compile-fail ../no_rtti_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_RVALUE_REFERENCES" : 
+test-suite "BOOST_NO_RVALUE_REFERENCES" : 
 [ run ../no_rvalue_references_pass.cpp ]
 [ compile-fail ../no_rvalue_references_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_SCOPED_ENUMS" : 
+test-suite "BOOST_NO_SCOPED_ENUMS" : 
 [ run ../no_scoped_enums_pass.cpp ]
 [ compile-fail ../no_scoped_enums_fail.cpp ] ;
 test-suite "BOOST_NO_SFINAE" : 
@@ -448,7 +424,7 @@ test-suite "BOOST_NO_SFINAE_EXPR" :
 test-suite "BOOST_NO_STRINGSTREAM" : 
 [ run ../no_sstream_pass.cpp ]
 [ compile-fail ../no_sstream_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_STATIC_ASSERT" : 
+test-suite "BOOST_NO_STATIC_ASSERT" : 
 [ run ../no_static_assert_pass.cpp ]
 [ compile-fail ../no_static_assert_fail.cpp ] ;
 test-suite "BOOST_NO_STDC_NAMESPACE" : 
@@ -481,6 +457,9 @@ test-suite "BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN" :
 test-suite "BOOST_NO_STD_TYPEINFO" : 
 [ run ../no_std_typeinfo_pass.cpp ]
 [ compile-fail ../no_std_typeinfo_fail.cpp ] ;
+test-suite "BOOST_NO_STD_UNORDERED" : 
+[ run ../no_std_unordered_pass.cpp ]
+[ compile-fail ../no_std_unordered_fail.cpp ] ;
 test-suite "BOOST_NO_STD_USE_FACET" : 
 [ run ../no_std_use_facet_pass.cpp ]
 [ compile-fail ../no_std_use_facet_fail.cpp ] ;
@@ -493,7 +472,7 @@ test-suite "BOOST_NO_STD_WSTRING" :
 test-suite "BOOST_NO_SWPRINTF" : 
 [ run ../no_swprintf_pass.cpp ]
 [ compile-fail ../no_swprintf_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_TEMPLATE_ALIASES" : 
+test-suite "BOOST_NO_TEMPLATE_ALIASES" : 
 [ run ../no_template_aliases_pass.cpp ]
 [ compile-fail ../no_template_aliases_fail.cpp ] ;
 test-suite "BOOST_NO_TEMPLATED_IOSTREAMS" : 
@@ -502,9 +481,6 @@ test-suite "BOOST_NO_TEMPLATED_IOSTREAMS" :
 test-suite "BOOST_NO_TEMPLATE_TEMPLATES" : 
 [ run ../no_template_template_pass.cpp ]
 [ compile-fail ../no_template_template_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS" : 
-[ run ../no_tem_local_classes_pass.cpp ]
-[ compile-fail ../no_tem_local_classes_fail.cpp ] ;
 test-suite "BOOST_NO_TWO_PHASE_NAME_LOOKUP" : 
 [ run ../no_two_phase_lookup_pass.cpp ]
 [ compile-fail ../no_two_phase_lookup_fail.cpp ] ;
@@ -514,10 +490,10 @@ test-suite "BOOST_NO_TYPEID" :
 test-suite "BOOST_NO_TYPENAME_WITH_CTOR" : 
 [ run ../no_typename_with_ctor_pass.cpp ]
 [ compile-fail ../no_typename_with_ctor_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_UNICODE_LITERALS" : 
+test-suite "BOOST_NO_UNICODE_LITERALS" : 
 [ run ../no_unicode_literals_pass.cpp ]
 [ compile-fail ../no_unicode_literals_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX" : 
+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" : 
@@ -529,10 +505,10 @@ test-suite "BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE" :
 test-suite "BOOST_NO_USING_TEMPLATE" : 
 [ run ../no_using_template_pass.cpp ]
 [ compile-fail ../no_using_template_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_VARIADIC_MACROS" : 
+test-suite "BOOST_NO_VARIADIC_MACROS" : 
 [ run ../no_variadic_macros_pass.cpp ]
 [ compile-fail ../no_variadic_macros_fail.cpp ] ;
-test-suite "BOOST_NO_CXX11_VARIADIC_TEMPLATES" : 
+test-suite "BOOST_NO_VARIADIC_TEMPLATES" : 
 [ run ../no_variadic_templates_pass.cpp ]
 [ compile-fail ../no_variadic_templates_fail.cpp ] ;
 test-suite "BOOST_NO_VOID_RETURNS" : 
--- a/test/boost_fallthrough_test.cpp
+++ b/test/boost_fallthrough_test.cpp
@@ -1,20 +0,0 @@
-//  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) 
-
-#include <boost/config.hpp> 
-
-int test(int n) 
-{ 
-   switch (n) 
-   { 
-   case 0: 
-      n++; 
-      BOOST_FALLTHROUGH; 
-   case 1: 
-      n++; 
-      break; 
-   } 
-   return n; 
-}
-
--- a/test/boost_has_ftime.ipp
+++ b/test/boost_has_ftime.ipp
@@ -6,17 +6,19 @@
 //  See http://www.boost.org/libs/config for most recent version.

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

 #include <windows.h>


 namespace boost_has_ftime{

-void f(FILETIME)
+void f()
 {
    // 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
@@ -1,30 +0,0 @@
-//  (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_has_hash.ipp
+++ b/test/boost_has_hash.ipp
@@ -1,6 +1,6 @@
-//  (C) Copyright John Maddock 2001.
-//  Use, modification and distribution are subject to the
-//  Boost Software License, Version 1.0. (See accompanying file
+//  (C) Copyright John Maddock 2001. 
+//  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.
@@ -11,13 +11,12 @@
 //                 or hash_map classes.

 #if defined(__GLIBCXX__) || (defined(__GLIBCPP__) && __GLIBCPP__>=20020514) // GCC >= 3.1.0
-#  ifdef BOOST_NO_CXX11_STD_UNORDERED
+#  ifdef BOOST_NO_STD_UNORDERED
 #    define BOOST_STD_EXTENSION_NAMESPACE __gnu_cxx
-#    define _BACKWARD_BACKWARD_WARNING_H 1 /* turn off warnings from the headers below */
 #    include <ext/hash_set>
 #    include <ext/hash_map>
 #  else
-     // If we have BOOST_NO_CXX11_STD_UNORDERED *not* defined, then we must
+     // If we have BOOST_NO_STD_UNORDERED *not* defined, then we must 
     // not include the <ext/*> headers as they clash with the C++0x
     // headers.  ie in any given translation unit we can include one
     // or the other, but not both.
--- a/test/boost_has_int128.ipp
+++ b/test/boost_has_int128.ipp
@@ -1,36 +0,0 @@
-//  (C) Copyright John Maddock 2012. 
-//  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_INT128
-//  TITLE:         __int128
-//  DESCRIPTION:   The platform supports __int128.
-
-#include <cstdlib>
-
-
-namespace boost_has_int128{
-
-int test()
-{
-#ifdef __GNUC__
-   __extension__ __int128 lli = 0;
-   __extension__ unsigned __int128 ulli = 0u;
-#else
-   __int128 lli = 0;
-   unsigned __int128 ulli = 0u;
-#endif
-   (void)&lli;
-   (void)&ulli;
-   return 0;
-}
-
-}
-
-
-
-
-
--- a/test/boost_has_nrvo.ipp
+++ b/test/boost_has_nrvo.ipp
@@ -1,7 +1,7 @@
 //  (C) Copyright Terje Slettebo 2001.
-//  (C) Copyright John Maddock 2001.
-//  Use, modification and distribution are subject to the
-//  Boost Software License, Version 1.0. (See accompanying file
+//  (C) Copyright John Maddock 2001. 
+//  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.
@@ -18,7 +18,7 @@ class test_class
 {
 public:
  test_class() {}
-  test_class(const test_class&)
+  test_class(const test_class &other)
  {
    ++copy_count;
  }
--- a/test/boost_no_cxx11_hdr_array.ipp
+++ b/test/boost_no_cxx11_hdr_array.ipp
@@ -6,17 +6,17 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_ARRAY
+//  MACRO:         BOOST_NO_0X_HDR_ARRAY
 //  TITLE:         C++0x header <array> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <array>

 #include <array>

-namespace boost_no_cxx11_hdr_array {
+namespace boost_no_0x_hdr_array {

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

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

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_CHRONO
+//  MACRO:         BOOST_NO_0X_HDR_CHRONO
 //  TITLE:         C++0x header <chrono> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <chrono>

 #include <chrono>

-namespace boost_no_cxx11_hdr_chrono {
+namespace boost_no_0x_hdr_chrono {

 int test()
 {
@@ -23,7 +23,7 @@ int test()
  using std::chrono::minutes;
  using std::chrono::hours;
  using std::chrono::system_clock;
-  using std::chrono::steady_clock;
+  using std::chrono::monotonic_clock;
  using std::chrono::high_resolution_clock;
  return 0;
 }
--- a/test/boost_no_cxx11_hdr_codecvt.ipp
+++ b/test/boost_no_cxx11_hdr_codecvt.ipp
@@ -6,13 +6,13 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_CODECVT
+//  MACRO:         BOOST_NO_0X_HDR_CODECVT
 //  TITLE:         C++0x header <codecvt> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <codecvt>

 #include <codecvt>

-namespace boost_no_cxx11_hdr_codecvt {
+namespace boost_no_0x_hdr_codecvt {

 int test()
 {
--- a/test/boost_no_cxx11_hdr_condition_variable.ipp
+++ b/test/boost_no_cxx11_hdr_condition_variable.ipp
@@ -6,13 +6,13 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_CONDITION_VARIABLE
+//  MACRO:         BOOST_NO_0X_HDR_CONDITION_VARIABLE
 //  TITLE:         C++0x header <condition_variable> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <condition_variable>

 #include <condition_variable>

-namespace boost_no_cxx11_hdr_condition_variable {
+namespace boost_no_0x_hdr_condition_variable {

 int test()
 {
--- a/test/boost_no_cxx11_hdr_forward_list.ipp
+++ b/test/boost_no_cxx11_hdr_forward_list.ipp
@@ -6,13 +6,13 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_FORWARD_LIST
+//  MACRO:         BOOST_NO_0X_HDR_FORWARD_LIST
 //  TITLE:         C++0x header <forward_list> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <forward_list>

 #include <forward_list>

-namespace boost_no_cxx11_hdr_forward_list {
+namespace boost_no_0x_hdr_forward_list {

 int test()
 {
--- a/test/boost_no_cxx11_hdr_future.ipp
+++ b/test/boost_no_cxx11_hdr_future.ipp
@@ -6,13 +6,13 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_FUTURE
+//  MACRO:         BOOST_NO_0X_HDR_FUTURE
 //  TITLE:         C++0x header <future> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <future>

 #include <future>

-namespace boost_no_cxx11_hdr_future {
+namespace boost_no_0x_hdr_future {

 int test()
 {
@@ -26,6 +26,7 @@ int test()
  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_cxx11_hdr_initializer_list.ipp
+++ b/test/boost_no_cxx11_hdr_initializer_list.ipp
@@ -6,15 +6,15 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_INITIALIZER_LIST
+//  MACRO:         BOOST_NO_0X_HDR_INITIALIZER_LIST
 //  TITLE:         C++0x header <initializer_list> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <initializer_list>

 #include <initializer_list>

-namespace boost_no_cxx11_hdr_initializer_list {
+namespace boost_no_0x_hdr_initializer_list {

-void foo(const std::initializer_list<const char*>&)
+void foo(const std::initializer_list<const char*>& l)
 {
 }

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

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_MUTEX
+//  MACRO:         BOOST_NO_0X_HDR_MUTEX
 //  TITLE:         C++0x header <mutex> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <mutex>

 #include <mutex>

-namespace boost_no_cxx11_hdr_mutex {
+namespace boost_no_0x_hdr_mutex {

 int test()
 {
--- a/test/boost_no_cxx11_hdr_random.ipp
+++ b/test/boost_no_cxx11_hdr_random.ipp
@@ -6,13 +6,13 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_RANDOM
+//  MACRO:         BOOST_NO_0X_HDR_RANDOM
 //  TITLE:         C++0x header <random> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <random>

 #include <random>

-namespace boost_no_cxx11_hdr_random {
+namespace boost_no_0x_hdr_random {

 int test()
 {
--- a/test/boost_no_cxx11_hdr_ratio.ipp
+++ b/test/boost_no_cxx11_hdr_ratio.ipp
@@ -6,13 +6,13 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_RATIO
+//  MACRO:         BOOST_NO_0X_HDR_RATIO
 //  TITLE:         C++0x header <ratio> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <ratio>

 #include <ratio>

-namespace boost_no_cxx11_hdr_ratio {
+namespace boost_no_0x_hdr_ratio {

 int test()
 {
--- a/test/boost_no_cxx11_hdr_regex.ipp
+++ b/test/boost_no_cxx11_hdr_regex.ipp
@@ -6,13 +6,13 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_REGEX
+//  MACRO:         BOOST_NO_0X_HDR_REGEX
 //  TITLE:         C++0x header <regex> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <regex>

 #include <regex>

-namespace boost_no_cxx11_hdr_regex {
+namespace boost_no_0x_hdr_regex {

 int test()
 {
--- a/test/boost_no_cxx11_hdr_system_error.ipp
+++ b/test/boost_no_cxx11_hdr_system_error.ipp
@@ -6,13 +6,13 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_SYSTEM_ERROR
+//  MACRO:         BOOST_NO_0X_HDR_SYSTEM_ERROR
 //  TITLE:         C++0x header <system_error> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <system_error>

 #include <system_error>

-namespace boost_no_cxx11_hdr_system_error {
+namespace boost_no_0x_hdr_system_error {

 int test()
 {
--- a/test/boost_no_cxx11_hdr_thread.ipp
+++ b/test/boost_no_cxx11_hdr_thread.ipp
@@ -6,13 +6,13 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_THREAD
+//  MACRO:         BOOST_NO_0X_HDR_THREAD
 //  TITLE:         C++0x header <thread> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <thread>

 #include <thread>

-namespace boost_no_cxx11_hdr_thread {
+namespace boost_no_0x_hdr_thread {

 int test()
 {
--- a/test/boost_no_cxx11_hdr_tuple.ipp
+++ b/test/boost_no_cxx11_hdr_tuple.ipp
@@ -6,13 +6,13 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_TUPLE
+//  MACRO:         BOOST_NO_0X_HDR_TUPLE
 //  TITLE:         C++0x header <tuple> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <tuple>

 #include <tuple>

-namespace boost_no_cxx11_hdr_tuple {
+namespace boost_no_0x_hdr_tuple {

 int test()
 {
--- a/test/boost_no_cxx11_hdr_type_traits.ipp
+++ b/test/boost_no_cxx11_hdr_type_traits.ipp
@@ -6,13 +6,13 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_TYPE_TRAITS
+//  MACRO:         BOOST_NO_0X_HDR_TYPE_TRAITS
 //  TITLE:         C++0x header <type_traits> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <type_traits>

 #include <type_traits>

-namespace boost_no_cxx11_hdr_type_traits {
+namespace boost_no_0x_hdr_type_traits {

 int test()
 {
@@ -76,6 +76,7 @@ int test()
  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;
--- a/test/boost_no_cxx11_hdr_typeindex.ipp
+++ b/test/boost_no_cxx11_hdr_typeindex.ipp
@@ -6,13 +6,13 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_TYPEINDEX
+//  MACRO:         BOOST_NO_0X_HDR_TYPEINDEX
 //  TITLE:         C++0x header <typeindex> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <typeindex>

 #include <typeindex>

-namespace boost_no_cxx11_hdr_typeindex {
+namespace boost_no_0x_hdr_typeindex {

 int test()
 {
--- a/test/boost_no_cxx11_hdr_unordered_map.ipp
+++ b/test/boost_no_cxx11_hdr_unordered_map.ipp
@@ -6,13 +6,13 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_UNORDERED_MAP
+//  MACRO:         BOOST_NO_0X_HDR_UNORDERED_MAP
 //  TITLE:         C++0x header <unordered_map> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <unordered_map>

 #include <unordered_map>

-namespace boost_no_cxx11_hdr_unordered_map {
+namespace boost_no_0x_hdr_unordered_map {

 int test()
 {
--- a/test/boost_no_cxx11_hdr_unordered_set.ipp
+++ b/test/boost_no_cxx11_hdr_unordered_set.ipp
@@ -6,13 +6,13 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_HDR_UNORDERED_SET
+//  MACRO:         BOOST_NO_0X_HDR_UNORDERED_SET
 //  TITLE:         C++0x header <unordered_set> unavailable
 //  DESCRIPTION:   The standard library does not supply C++0x header <unordered_set>

 #include <unordered_set>

-namespace boost_no_cxx11_hdr_unordered_set {
+namespace boost_no_0x_hdr_unordered_set {

 int test()
 {
--- a/test/boost_no_auto_declarations.ipp
+++ b/test/boost_no_auto_declarations.ipp
@@ -5,13 +5,13 @@

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

-//  MACRO:         BOOST_NO_CXX11_AUTO_DECLARATIONS
+//  MACRO:         BOOST_NO_AUTO_DECLARATIONS
 //  TITLE:         C++0x auto declarators unavailable
 //  DESCRIPTION:   The compiler does not support C++0x declarations of variables with automatically deduced type

-namespace boost_no_cxx11_auto_declarations {
+namespace boost_no_auto_declarations {

-void check_f(int&)
+void check_f(int& x)
 {
 }

--- a/test/boost_no_auto_multidecl.ipp
+++ b/test/boost_no_auto_multidecl.ipp
@@ -5,13 +5,13 @@

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

-//  MACRO:         BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+//  MACRO:         BOOST_NO_AUTO_MULTIDECLARATIONS
 //  TITLE:         C++0x auto multideclarators unavailable
 //  DESCRIPTION:   The compiler does not support C++0x declarations of series of variables with automatically deduced type

-namespace boost_no_cxx11_auto_multideclarations {
+namespace boost_no_auto_multideclarations {

-void check_f(int&, int*&)
+void check_f(int& x, int*& y)
 {
 }

--- a/test/boost_no_char16_t.ipp
+++ b/test/boost_no_char16_t.ipp
@@ -7,25 +7,15 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_CHAR16_T
+//  MACRO:         BOOST_NO_CHAR16_T
 //  TITLE:         C++0x char16_t unavailable
 //  DESCRIPTION:   The compiler does not support C++0x char16_t

-namespace boost_no_cxx11_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*){}
+namespace boost_no_char16_t {

 int test()
 {
-  const char16_t p(0);
-  f(&p);
+  const char16_t* p = u"abc";
  return 0;
 }

--- a/test/boost_no_char32_t.ipp
+++ b/test/boost_no_char32_t.ipp
@@ -6,25 +6,15 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_CHAR32_T
+//  MACRO:         BOOST_NO_CHAR32_T
 //  TITLE:         C++0x char32_t unavailable
 //  DESCRIPTION:   The compiler does not support C++0x char32_t

-namespace boost_no_cxx11_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*){}
+namespace boost_no_char32_t {

 int test()
 {
-  const char32_t p(0);
-  f(&p);
+  const char32_t* p = U"abc";
  return 0;
 }

--- a/test/boost_no_constexpr.ipp
+++ b/test/boost_no_constexpr.ipp
@@ -6,13 +6,11 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_CONSTEXPR 
+//  MACRO:         BOOST_NO_CONSTEXPR 
 //  TITLE:         C++0x constexpr unavailable
 //  DESCRIPTION:   The compiler does not support C++0x constexpr

-namespace boost_no_cxx11_constexpr {
-
-void quiet_warning(int){}
+namespace boost_no_constexpr {

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

@@ -39,7 +37,6 @@ X<a> xx; // OK: unique conversion to int
 int test()
 {
  int i = square(5);
-  quiet_warning(i);
  return 0;
 }

--- a/test/boost_no_cxx11_allocator.ipp
+++ b/test/boost_no_cxx11_allocator.ipp
@@ -1,38 +0,0 @@
-//  (C) Copyright John Maddock 2012
-
-//  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_CXX11_ALLOCATOR
-//  TITLE:         C++11 <memory> doesn't have C++0x allocator support
-//  DESCRIPTION:   The compiler does not support the C++11 allocator features added to <memory>
-
-#include <memory>
-
-namespace boost_no_cxx11_allocator {
-
-int test()
-{
-   std::pointer_traits<char*>* p = 0;
-   (void) p;
-   //std::pointer_safety s = std::relaxed;
-
-   //char* (*l_undeclare_reachable)(char *p) = std::undeclare_reachable;
-   //void (*l_declare_no_pointers)(char *p, size_t n) = std::declare_no_pointers;
-   //void (*l_undeclare_no_pointers)(char *p, size_t n) = std::undeclare_no_pointers;
-   //std::pointer_safety (*l_get_pointer_safety)() = std::get_pointer_safety;
-   //void* (*l_align)(std::size_t alignment, std::size_t size, void *&ptr, std::size_t& space) = std::align;
-   std::allocator_arg_t aat;
-   std::uses_allocator<int, std::allocator<int> > ua;
-   std::allocator_traits<std::allocator<int> > at;
-
-   (void)aat;
-   (void)ua;
-   (void)at;
-   return 0;
-}
-
-}
--- a/test/boost_no_cxx11_atomic_sp.ipp
+++ b/test/boost_no_cxx11_atomic_sp.ipp
@@ -1,36 +0,0 @@
-//  (C) Copyright John Maddock 2012
-
-//  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_CXX11_ATOMIC_SMART_PTR
-//  TITLE:         C++11 <memory> does not support atomic smart pointer operations
-//  DESCRIPTION:   The compiler does not support the C++11 atomic smart pointer features added to <memory>
-
-#include <memory>
-
-namespace boost_no_cxx11_atomic_smart_ptr {
-
-int test()
-{
-   std::shared_ptr<int> spi(new int), spi2(new int);
-   spi = std::static_pointer_cast<int>(spi);
-
-   atomic_is_lock_free(&spi);
-   atomic_load(&spi);
-   atomic_load_explicit(&spi, std::memory_order_relaxed);
-   atomic_store(&spi, spi2);
-   atomic_store_explicit(&spi, spi2, std::memory_order_relaxed);
-   atomic_exchange(&spi, spi2);
-   atomic_compare_exchange_weak(&spi, &spi2, spi);
-   atomic_compare_exchange_strong(&spi, &spi2, spi);
-   atomic_compare_exchange_weak_explicit(&spi, &spi2, spi, std::memory_order_relaxed, std::memory_order_relaxed);
-   atomic_compare_exchange_strong_explicit(&spi, &spi2, spi, std::memory_order_relaxed, std::memory_order_relaxed);
-
-   return 0;
-}
-
-}
--- a/test/boost_no_cxx11_smart_ptr.ipp
+++ b/test/boost_no_cxx11_smart_ptr.ipp
@@ -1,35 +0,0 @@
-//  (C) Copyright John Maddock 2012
-
-//  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_CXX11_SMART_PTR
-//  TITLE:         C++11 <memory> has no shared_ptr and unique_ptr
-//  DESCRIPTION:   The compiler does not support the C++11 smart pointer features added to <memory>
-
-#include <memory>
-// Hash functions for shared pointers should be in <memory>
-// but with some std lib's we have to include <functional> as well...
-#include <functional>
-
-namespace boost_no_cxx11_smart_ptr {
-
-int test()
-{
-   std::unique_ptr<int> upi(new int);
-   std::shared_ptr<int> spi(new int), spi2(new int);
-   spi = std::static_pointer_cast<int>(spi);
-
-   std::hash<std::shared_ptr<int> > h1;
-   std::hash<std::unique_ptr<int> > h2;
-
-   (void)h1;
-   (void)h2;
-
-   return 0;
-}
-
-}
--- a/test/boost_no_cxx11_user_lit.ipp
+++ b/test/boost_no_cxx11_user_lit.ipp
@@ -1,67 +0,0 @@
-//  (C) Copyright John Maddock 2013
-
-//  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_CXX11_USER_DEFINED_LITERALS
-//  TITLE:         C++11 user defined literals.
-//  DESCRIPTION:   The compiler does not support the C++11 literals including user-defined suffixes.
-
-#include <memory>
-
-namespace boost_no_cxx11_user_defined_literals {
-
-struct my_literal
-{
-   constexpr my_literal() : val(0) {}
-   constexpr my_literal(int i) : val(i) {}
-   constexpr my_literal(const my_literal& a) : val(a.val) {}
-   constexpr bool operator==(const my_literal& a) { return val == a.val; }
-   int val;
-};
-
-template <unsigned base, unsigned long long val, char... Digits>
-struct parse_int
-{
-    // The default specialization is also the termination condition:
-    // it gets invoked only when sizeof...Digits == 0.
-    static_assert(base<=16u,"only support up to hexadecimal");
-    static constexpr unsigned long long value{ val };
-};
-
-template <unsigned base, unsigned long long val, char c, char... Digits>
-struct parse_int<base, val, c, Digits...>
-{
-    static constexpr unsigned long long char_value = (c >= '0' && c <= '9')
-            ? c - '0'
-            : (c >= 'a' && c <= 'f')
-            ? c - 'a'
-            : (c >= 'A' && c <= 'F')
-            ? c - 'A'
-            : 400u;
-    static_assert(char_value < base, "Encountered a digit out of range");
-    static constexpr unsigned long long value{ parse_int<base, val * base +
-char_value, Digits...>::value };
-};
-
-constexpr my_literal operator "" _suf1(unsigned long long v)
-{
-   return my_literal(v);
-}
-template <char...PACK>
-constexpr my_literal operator "" _bin()
-{
-   return parse_int<2, 0, PACK...>::value;
-}
-
-int test()
-{
-   constexpr my_literal a = 0x23_suf1;
-   constexpr my_literal b = 1001_bin;
-   return ((a == my_literal(0x23)) && (b == my_literal(9))) ? 0 : 1;
-}
-
-}
--- a/test/boost_no_cxx_hdr_functional.ipp
+++ b/test/boost_no_cxx_hdr_functional.ipp
@@ -1,43 +0,0 @@
-//  (C) Copyright John Maddock 2012
-
-//  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_CXX11_HDR_FUNCTIONAL
-//  TITLE:         C++11 <functional> unavailable
-//  DESCRIPTION:   The compiler does not support the C++11 features added to <functional>
-
-#include <functional>
-
-void f(int, float){}
-
-namespace boost_no_cxx11_hdr_functional {
-
-int test()
-{
-   int i = 0;
-   std::ref(i);
-   std::cref(i);
-
-   std::bit_and<int> b1;
-   std::bit_or<int>  b2;
-   std::bit_xor<int> b3;
-
-   std::hash<short> hs;
-
-   (void)b1;
-   (void)b2;
-   (void)b3;
-   (void)hs;
-
-   std::bind(f, std::placeholders::_1, 0.0f);
-
-   std::function<void(int, float)> fun(f);
-
-   return 0;
-}
-
-}
--- a/test/boost_no_decltype.ipp
+++ b/test/boost_no_decltype.ipp
@@ -7,13 +7,11 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_DECLTYPE
+//  MACRO:         BOOST_NO_DECLTYPE
 //  TITLE:         C++0x decltype unavailable
 //  DESCRIPTION:   The compiler does not support C++0x decltype

-namespace boost_no_cxx11_decltype {
-
-void quiet_warning(int){}
+namespace boost_no_decltype {

 struct test_class
 {
@@ -40,14 +38,9 @@ void baz(F f)
 int test()
 {
  int i;
-  decltype(i) j(0);
-  quiet_warning(j);
+  decltype(i) 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
@@ -1,137 +0,0 @@
-
-//  (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_CXX11_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_cxx11_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
@@ -6,15 +6,15 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_DEFAULTED_FUNCTIONS 
+//  MACRO:         BOOST_NO_DEFAULTED_FUNCTIONS 
 //  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
+#  error Defaulted functions aren't really supported in non-C++0x mode
 #endif

-namespace boost_no_cxx11_defaulted_functions {
+namespace boost_no_defaulted_functions {

  struct foo {
    foo() = default;
--- a/test/boost_no_deleted_functions.ipp
+++ b/test/boost_no_deleted_functions.ipp
@@ -6,15 +6,15 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_DELETED_FUNCTIONS 
+//  MACRO:         BOOST_NO_DELETED_FUNCTIONS 
 //  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
+#  error Deleted functions aren't really supported in non-C++0x mode
 #endif

-namespace boost_no_cxx11_deleted_functions {
+namespace boost_no_deleted_functions {

  struct foo {
    foo() = delete;
--- a/test/boost_no_explicit_cvt_ops.ipp
+++ b/test/boost_no_explicit_cvt_ops.ipp
@@ -6,17 +6,15 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS 
+//  MACRO:         BOOST_NO_EXPLICIT_CONVERSION_OPERATORS 
 //  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
+#  error This feature isn't really available in non-C++0x mode
 #endif

-namespace boost_no_cxx11_explicit_conversion_operators {
-
-void quiet_warning(int){}
+namespace boost_no_explicit_conversion_operators {

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

--- a/test/boost_no_extern_template.ipp
+++ b/test/boost_no_extern_template.ipp
@@ -6,11 +6,11 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_EXTERN_TEMPLATE
+//  MACRO:         BOOST_NO_EXTERN_TEMPLATE
 //  TITLE:         C++0x extern template unavailable
 //  DESCRIPTION:   The compiler does not support C++0x extern template

-namespace boost_no_cxx11_extern_template {
+namespace boost_no_extern_template {

 template<class T, class U> void f(T const* p, U const* q)
 {
--- a/test/boost_no_function_template_default_args.ipp
+++ b/test/boost_no_function_template_default_args.ipp
@@ -5,11 +5,11 @@

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

-//  MACRO:         BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
+//  MACRO:         BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 //  TITLE:         Default template arguments for function templates
 //  DESCRIPTION:   Default template arguments for function templates are not supported.

-namespace boost_no_cxx11_function_template_default_args
+namespace boost_no_function_template_default_args
 {

 template<typename T = int>
--- a/test/boost_no_initializer_lists.ipp
+++ b/test/boost_no_initializer_lists.ipp
@@ -0,0 +1,31 @@
+//  (C) Copyright Daniel James 2008.
+//  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_INITIALIZER_LISTS
+//  TITLE:         Initializer Lists 
+//  DESCRIPTION:   If the compiler does not support C++0x initializer lists
+
+#include <initializer_list>
+#include <vector>
+#include <string>
+
+namespace boost_no_initializer_lists {
+
+void f(std::initializer_list<int>)
+{
+}
+
+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 };
+    return 0;
+}
+
+}
--- a/test/boost_no_is_abstract.ipp
+++ b/test/boost_no_is_abstract.ipp
@@ -1,6 +1,6 @@
-//  (C) Copyright John Maddock and Dave Abrahams 2002.
-//  Use, modification and distribution are subject to the
-//  Boost Software License, Version 1.0. (See accompanying file
+//  (C) Copyright John Maddock and Dave Abrahams 2002. 
+//  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.
@@ -46,7 +46,7 @@ struct abstract{ virtual void foo() = 0; };

 int test()
 {
-   return static_cast<bool>(is_abstract_test<non_abstract>::value) == static_cast<bool>(is_abstract_test<abstract>::value);
+   return is_abstract_test<non_abstract>::value == is_abstract_test<abstract>::value;
 }

 }
--- a/test/boost_no_lambdas.ipp
+++ b/test/boost_no_lambdas.ipp
@@ -6,15 +6,15 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_LAMBDAS
+//  MACRO:         BOOST_NO_LAMBDAS
 //  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
+#  error This feature isn't really available in non-C++0x mode
 #endif

-namespace boost_no_cxx11_lambdas {
+namespace boost_no_lambdas {

 int test()
 {
--- a/test/boost_no_cxx11_numeric_limits.ipp
+++ b/test/boost_no_cxx11_numeric_limits.ipp
@@ -5,13 +5,13 @@

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

-//  MACRO:         BOOST_NO_CXX11_NUMERIC_LIMITS
+//  MACRO:         BOOST_NO_NUMERIC_LIMITS_LOWEST
 //  TITLE:         static function lowest() in numeric_limits class <limits>
 //  DESCRIPTION:   static function numeric_limits<T>::lowest() are not available for use.

 #include <limits>

-namespace boost_no_cxx11_numeric_limits{
+namespace boost_no_numeric_limits_lowest{

 int f()
 {
--- a/test/boost_no_noexcept.ipp
+++ b/test/boost_no_noexcept.ipp
@@ -5,13 +5,11 @@

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

-//  MACRO:         BOOST_NO_CXX11_NOEXCEPT
+//  MACRO:         BOOST_NO_NOEXCEPT
 //  TITLE:         C++0x noexcept unavailable
 //  DESCRIPTION:   The compiler does not support C++0x noexcept

-namespace boost_no_cxx11_noexcept {
-
-void quiet_warning(bool){}
+namespace boost_no_noexcept {

 int f() noexcept ;
 int g() noexcept( noexcept( f() ) ) ;
@@ -19,7 +17,6 @@ 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
@@ -6,18 +6,15 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_NULLPTR
+//  MACRO:         BOOST_NO_NULLPTR
 //  TITLE:         C++0x nullptr feature unavailable
 //  DESCRIPTION:   The compiler does not support the C++0x nullptr feature

-namespace boost_no_cxx11_nullptr {
-
-void quiet_warning(const int*){}
+namespace boost_no_nullptr {

 int test()
 {
  int * p = nullptr;
-  quiet_warning(p);
  return 0;
 }

--- a/test/boost_no_range_based_for.ipp
+++ b/test/boost_no_range_based_for.ipp
@@ -1,23 +0,0 @@
-//  Copyright Beman Dawes 2012
-
-//  Distributed under the Boost Software License, Version 1.0.
-//  See http://www.boost.org/LICENSE_1_0.txt
-
-//  See http://www.boost.org/libs/config for more information.
-
-//  MACRO:         BOOST_NO_CXX11_RANGE_BASED_FOR
-//  TITLE:         C++11 ranged-based for statement unavailable
-//  DESCRIPTION:   The compiler does not support the C++11 range-based for statement
-
-namespace boost_no_cxx11_range_based_for {
-
-int test()
-{
-  // example from 6.5.4 The range-based for statement [stmt.ranged]
-  int array[5] = { 1, 2, 3, 4, 5 };
-  for (int& x : array)
-    x *= 2;
-  return 0;
-}
-
-}
--- a/test/boost_no_raw_literals.ipp
+++ b/test/boost_no_raw_literals.ipp
@@ -6,21 +6,16 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_RAW_LITERALS
+//  MACRO:         BOOST_NO_RAW_LITERALS
 //  TITLE:         C++0x raw string literals unavailable
 //  DESCRIPTION:   The compiler does not support C++0x raw string literals

-namespace boost_no_cxx11_raw_literals {
-
-void quiet_warning(const char*){}
-void quiet_warning(const wchar_t*){}
+namespace boost_no_raw_literals {

 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_rvalue_references.ipp
+++ b/test/boost_no_rvalue_references.ipp
@@ -5,11 +5,11 @@

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

-//  MACRO:         BOOST_NO_CXX11_RVALUE_REFERENCES
+//  MACRO:         BOOST_NO_RVALUE_REFERENCES
 //  TITLE:         C++0x rvalue references unavailable
 //  DESCRIPTION:   The compiler does not support C++0x rvalue references

-namespace boost_no_cxx11_rvalue_references {
+namespace boost_no_rvalue_references {

 void g(int&) {}

--- a/test/boost_no_scoped_enums.ipp
+++ b/test/boost_no_scoped_enums.ipp
@@ -6,11 +6,11 @@

 //  See http://www.boost.org/libs/config for more information.

-//  MACRO:         BOOST_NO_CXX11_SCOPED_ENUMS
+//  MACRO:         BOOST_NO_SCOPED_ENUMS
 //  TITLE:         C++0x scoped enum unavailable
 //  DESCRIPTION:   The compiler does not support C++0x scoped enum

-namespace boost_no_cxx11_scoped_enums {
+namespace boost_no_scoped_enums {

 int test()
 {
--- a/test/boost_no_static_assert.ipp
+++ b/test/boost_no_static_assert.ipp
@@ -5,11 +5,11 @@

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

-//  MACRO:         BOOST_NO_CXX11_STATIC_ASSERT
+//  MACRO:         BOOST_NO_STATIC_ASSERT
 //  TITLE:         C++0x static_assert unavailable
 //  DESCRIPTION:   The compiler does not support C++0x static assertions

-namespace boost_no_cxx11_static_assert {
+namespace boost_no_static_assert {

 int test()
 {
--- a/test/boost_no_std_typeinfo.ipp
+++ b/test/boost_no_std_typeinfo.ipp
@@ -13,12 +13,10 @@

 namespace boost_no_std_typeinfo
 {
-void quiet_warning(const std::type_info*){}

 int test()
 {
   std::type_info * p = 0;
-   quiet_warning(p);
   return 0;
 }

--- a/Show More
+++ b/Show More