Release 1.46.1

[SVN r69890]
2011-03-12 15:41:16 +00:00
89 changed files with 861 additions and 657 deletions
--- a/doc/html/boost_config/boost_macro_reference.html
+++ b/doc/html/boost_config/boost_macro_reference.html
@@ -42,12 +42,14 @@
 <dt><span class="section"><a href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_for_libraries_with_separate_source_code">Macros
      for libraries with separate source code</a></span></dt>
 </dl></div>
+<a name="config_defects"></a><p>
+    </p>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_config.boost_macro_reference.macros_that_describe_defects"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_defects" title="Macros that describe defects">Macros
      that describe defects</a>
 </h3></div></div></div>
-<a name="config_defects"></a><p>
+<p>
        The following macros all describe features that are required by the C++ standard,
        if one of the following macros is defined, then it represents a defect in
        the compiler's conformance with the standard.
@@ -280,26 +282,6 @@
              </td>
 </tr>
 <tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">BOOST_NO_FENV_H</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  Platform, Standard library
-                </p>
-              </td>
-<td>
-                <p>
-                  The C standard library doesn't provide <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">fenv</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span></code>.
-                  <a href="../../../../../boost/detail/fenv.hpp" target="_top"><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">detail</span><span class="special">/</span><span class="identifier">fenv</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code></a>
-                  should be included instead of <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">fenv</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span></code>
-                  for maximum portability on platforms which do provide <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">fenv</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span></code>.
-                </p>
-              </td>
-</tr>
-<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_NO_DEPENDENT_NESTED_DERIVATIONS</span></code>
@@ -1324,12 +1306,14 @@
 </tbody>
 </table></div>
 </div>
+<a name="config_features"></a><p>
+    </p>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_config.boost_macro_reference.macros_that_describe_optional_features"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.macros_that_describe_optional_features" title="Macros that describe optional features">Macros
      that describe optional features</a>
 </h3></div></div></div>
-<a name="config_features"></a><p>
+<p>
        The following macros describe features that are not required by the C++ standard.
        The macro is only defined if the feature is present.
      </p>
@@ -1711,6 +1695,26 @@
              </td>
 </tr>
 <tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">BOOST_HAS_FENV_H</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  Platform, Standard library
+                </p>
+              </td>
+<td>
+                <p>
+                  The platform has a <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">fenv</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span></code>.
+                  <a href="../../../../../boost/detail/fenv.hpp" target="_top"><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">detail</span><span class="special">/</span><span class="identifier">fenv</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code></a>
+                  should be included instead of <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">fenv</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span></code>
+                  for maximum portability.
+                </p>
+              </td>
+</tr>
+<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_HAS_STDINT_H</span></code>
@@ -2321,6 +2325,18 @@
              </td>
 </tr>
 <tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">BOOST_NO_0X_HDR_CONCEPTS</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  The standard library does not provide header &lt;concepts&gt;.
+                </p>
+              </td>
+</tr>
+<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_NO_0X_HDR_CONDITION_VARIABLE</span></code>
@@ -2333,6 +2349,18 @@
              </td>
 </tr>
 <tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">BOOST_NO_0X_HDR_CONTAINER_CONCEPTS</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  The standard library does not provide header &lt;container_concepts&gt;.
+                </p>
+              </td>
+</tr>
+<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_NO_0X_HDR_FORWARD_LIST</span></code>
@@ -2369,6 +2397,30 @@
              </td>
 </tr>
 <tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">BOOST_NO_0X_HDR_ITERATOR_CONCEPTS</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  The standard library does not provide header &lt;iterator_concepts&gt;.
+                </p>
+              </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">BOOST_NO_0X_HDR_MEMORY_CONCEPTS</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  The standard library does not provide header &lt;memory_concepts&gt;.
+                </p>
+              </td>
+</tr>
+<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_NO_0X_HDR_MUTEX</span></code>
@@ -2557,6 +2609,18 @@
              </td>
 </tr>
 <tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">BOOST_NO_CONCEPTS</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  The compiler does not support Concepts.
+                </p>
+              </td>
+</tr>
+<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_NO_TEMPLATE_ALIASES</span></code>
@@ -2695,18 +2759,6 @@
              </td>
 </tr>
 <tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">BOOST_NO_NOEXCEPT</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  The compiler does not support <code class="computeroutput"><span class="identifier">noexcept</span></code>.
-                </p>
-              </td>
-</tr>
-<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_NO_NULLPTR</span></code>
@@ -2805,19 +2857,6 @@
              </td>
 </tr>
 <tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  The compiler does not support the <a href="http://en.wikipedia.org/wiki/C%2B%2B0x#Uniform_initialization" target="_top">C++11
-                  Unified Initialization Syntax</a>.
-                </p>
-              </td>
-</tr>
-<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_NO_VARIADIC_TEMPLATES</span></code>
@@ -2844,12 +2883,14 @@
 </tbody>
 </table></div>
 </div>
+<a name="config_helpers"></a><p>
+    </p>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_config.boost_macro_reference.boost_helper_macros"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.boost_helper_macros" title="Boost Helper Macros">Boost
      Helper Macros</a>
 </h3></div></div></div>
-<a name="config_helpers"></a><p>
+<p>
        The following macros are either simple helpers, or macros that provide workarounds
        for compiler/standard library defects.
      </p>
@@ -2919,30 +2960,6 @@
              </td>
 </tr>
 <tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">BOOST_PREVENT_MACRO_SUBSTITUTION</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  Sometimes you have a function name with the same name as a C macro,
-                  for example "min" and "max" member functions,
-                  in which case one can prevent the function being expanded as a
-                  macro using: 
-</p>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="identifier">someclass</span><span class="special">.</span><span class="identifier">min</span> <span class="identifier">BOOST_PREVENT_MACRO_SUBSTITUTION</span><span class="special">(</span><span class="identifier">arg1</span><span class="special">,</span> <span class="identifier">arg2</span><span class="special">);</span>
-</pre>
-<p>
-                  The following also works in most, but not all, contexts: 
-</p>
-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"><span class="special">(</span><span class="identifier">someclass</span><span class="special">.</span><span class="identifier">max</span><span class="special">)(</span><span class="identifier">arg1</span><span class="special">,</span> <span class="identifier">arg2</span><span class="special">);</span>
-</pre>
-<p>
-                </p>
-              </td>
-</tr>
-<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">BOOST_DEDUCED_TYPENAME</span></code>
@@ -3277,12 +3294,14 @@
 </tbody>
 </table></div>
 </div>
+<a name="config_info_macros"></a><p>
+    </p>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="boost_config.boost_macro_reference.boost_informational_macros"></a><a class="link" href="boost_macro_reference.html#boost_config.boost_macro_reference.boost_informational_macros" title="Boost Informational Macros">Boost
      Informational Macros</a>
 </h3></div></div></div>
-<a name="config_info_macros"></a><p>
+<p>
        The following macros describe boost features; these are, generally speaking
        the only boost macros that should be tested in user code.
      </p>
@@ -3457,7 +3476,7 @@
              </td>
 <td>
                <p>
-                  Defined if the Windows platform API is available.
+                  Defined if the Windows platfrom API is available.
                </p>
              </td>
 </tr>
--- a/doc/html/boost_config/guidelines_for_boost_authors.html
+++ b/doc/html/boost_config/guidelines_for_boost_authors.html
@@ -28,8 +28,8 @@
    Boost Authors</a>
 </h2></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.warnings">Disabling
-      Compiler Warnings</a></span></dt>
+<dt><span class="section"><a href="guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.warnings">
+      Disabling Compiler Warnings</a></span></dt>
 <dt><span class="section"><a href="guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.adding_new_defect_macros">Adding
      New Defect Macros</a></span></dt>
 <dt><span class="section"><a href="guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.adding_new_feature_test_macros">Adding
@@ -105,8 +105,8 @@
 </ul></div>
 <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>
+<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>
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -28,7 +28,7 @@
 </h3></div></div></div>
 <div><p class="copyright">Copyright &#169; 2001 -2007 Beman Dawes, Vesa Karvonen, John Maddock</p></div>
 <div><div class="legalnotice">
-<a name="id996438"></a><p>
+<a name="id663915"></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>
@@ -75,8 +75,8 @@
 <dt><span class="section"><a href="boost_config/guidelines_for_boost_authors.html">Guidelines for
    Boost Authors</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="boost_config/guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.warnings">Disabling
-      Compiler Warnings</a></span></dt>
+<dt><span class="section"><a href="boost_config/guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.warnings">
+      Disabling Compiler Warnings</a></span></dt>
 <dt><span class="section"><a href="boost_config/guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.adding_new_defect_macros">Adding
      New Defect Macros</a></span></dt>
 <dt><span class="section"><a href="boost_config/guidelines_for_boost_authors.html#boost_config.guidelines_for_boost_authors.adding_new_feature_test_macros">Adding
@@ -166,12 +166,14 @@
        developers list.
      </p>
 </div>
+<a name="config_config_script"></a><p>
+    </p>
 <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 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>
-<a name="config_config_script"></a><div class="important"><table border="0" summary="Important">
+<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>
@@ -308,12 +310,14 @@
          </li>
 </ul></div>
 </div>
+<a name="config_user_settable"></a><p>
+    </p>
 <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 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>
-<a name="config_user_settable"></a><p>
+<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>
@@ -946,7 +950,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: May 09, 2011 at 11:33:33 GMT</small></p></td>
+<td align="left"><p><small>Last revised: November 23, 2010 at 03:21:20 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
@@ -539,10 +539,14 @@ that are not yet supported by a particular compiler or library.
 [[`BOOST_NO_0X_HDR_ARRAY`][The standard library does not provide header <array>.]]
 [[`BOOST_NO_0X_HDR_CHRONO`][The standard library does not provide header <chrono>.]]
 [[`BOOST_NO_0X_HDR_CODECVT`][The standard library does not provide header <codecvt>.]]
+[[`BOOST_NO_0X_HDR_CONCEPTS`][The standard library does not provide header <concepts>.]]
 [[`BOOST_NO_0X_HDR_CONDITION_VARIABLE`][The standard library does not provide header <condition_variable>.]]
+[[`BOOST_NO_0X_HDR_CONTAINER_CONCEPTS`][The standard library does not provide header <container_concepts>.]]
 [[`BOOST_NO_0X_HDR_FORWARD_LIST`][The standard library does not provide header <forward_list>.]]
 [[`BOOST_NO_0X_HDR_FUTURE`][The standard library does not provide header <future>.]]
 [[`BOOST_NO_0X_HDR_INITIALIZER_LIST`][The standard library does not provide header <initializer_list>.]]
+[[`BOOST_NO_0X_HDR_ITERATOR_CONCEPTS`][The standard library does not provide header <iterator_concepts>.]]
+[[`BOOST_NO_0X_HDR_MEMORY_CONCEPTS`][The standard library does not provide header <memory_concepts>.]]
 [[`BOOST_NO_0X_HDR_MUTEX`][The standard library does not provide header <mutex>.]]
 [[`BOOST_NO_0X_HDR_RANDOM`][The standard library does not provide header <random>.]]
 [[`BOOST_NO_0X_HDR_RATIO`][The standard library does not provide header <ratio>.]]
@@ -567,6 +571,8 @@ type `char16_t`.
 [[`BOOST_NO_CHAR32_T`][The compiler does not support 
 type `char32_t`. 
 ]]                       
+[[`BOOST_NO_CONCEPTS`][The compiler does not support Concepts. 
+]]                      
 [[`BOOST_NO_TEMPLATE_ALIASES`][The compiler does not support template aliases. 
 ]]                      
 [[`BOOST_NO_CONSTEXPR`][The compiler does not support 
@@ -597,8 +603,6 @@ The C++ compiler does not support C++0x initializer lists.
 ]]                      
 [[`BOOST_NO_LONG_LONG`][The compiler does not support `long long`.
 ]]                
-[[`BOOST_NO_NOEXCEPT`][The compiler does not support `noexcept`. 
-]]                      
 [[`BOOST_NO_NULLPTR`][The compiler does not support 'nullptr'. 
 ]]                      
 [[`BOOST_NO_RAW_LITERALS`][The compiler does not support
@@ -620,10 +624,7 @@ scoped enumerations (`enum class`).
 ]]                      
 [[`BOOST_NO_UNICODE_LITERALS`][The compiler does not support
 Unicode (`u8`, `u`, `U`) literals. 
-]] 
-[[`BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX`][The compiler does not support
-the [@http://en.wikipedia.org/wiki/C%2B%2B0x#Uniform_initialization C++11 Unified Initialization Syntax].
-]]
+]]               
 [[`BOOST_NO_VARIADIC_TEMPLATES`][The compiler does not support
 variadic templates. 
 ]]
@@ -673,17 +674,6 @@ of `__BORLANDC__` /unless/ the macro `BOOST_DETECT_OUTDATED_WORKAROUNDS` is defi

 [*Note]: the ultimate source of documentation for this macro is in [@../../../../boost/detail/workaround.hpp boost/detail/workaround.hpp].
 ]]
-[[`BOOST_PREVENT_MACRO_SUBSTITUTION`][
-Sometimes you have a function name with the same name as a C macro, for example "min" and "max"
-member functions, in which case one can prevent the function being expanded as a macro using:
-``
-someclass.min BOOST_PREVENT_MACRO_SUBSTITUTION(arg1, arg2);
-``
-The following also works in most, but not all, contexts:
-``
-(someclass.max)(arg1, arg2);
-``
-]]
 [[`BOOST_DEDUCED_TYPENAME`][
 Some compilers don't support the use of typename for dependent types in deduced
 contexts. This macro expands to nothing on those compilers, and typename
@@ -890,7 +880,7 @@ compiler version macro.
 Defined to 1 if the compiler is the Clang compiler.
 ]]
 [[`BOOST_WINDOWS`][`<boost/config.hpp>`][
-Defined if the Windows platform API is available.
+Defined if the Windows platfrom API is available.
 ]]
 [[`BOOST_DINKUMWARE_STDLIB`][`<boost/config.hpp>`][
 Defined if the dinkumware standard library is in use, takes the same value
--- a/include/boost/config.hpp
+++ b/include/boost/config.hpp
@@ -36,7 +36,7 @@
 #endif

 // if we don't have a std library config set, try and find one:
-#if !defined(BOOST_STDLIB_CONFIG) && !defined(BOOST_NO_STDLIB_CONFIG) && !defined(BOOST_NO_CONFIG) && defined(__cplusplus)
+#if !defined(BOOST_STDLIB_CONFIG) && !defined(BOOST_NO_STDLIB_CONFIG) && !defined(BOOST_NO_CONFIG)
 #  include <boost/config/select_stdlib_config.hpp>
 #endif
 // if we have a std library config, include it now:
--- a/include/boost/config/compiler/borland.hpp
+++ b/include/boost/config/compiler/borland.hpp
@@ -56,13 +56,8 @@
 #  define BOOST_NO_CV_VOID_SPECIALIZATIONS
 #  define BOOST_NO_DEDUCED_TYPENAME
 // workaround for missing WCHAR_MAX/WCHAR_MIN:
-#ifdef __cplusplus
 #include <climits>
 #include <cwchar>
-#else
-#include <limits.h>
-#include <wchar.h>
-#endif // __cplusplus
 #ifndef WCHAR_MAX
 #  define WCHAR_MAX 0xffff
 #endif
@@ -74,7 +69,7 @@
 // Borland C++ Builder 6 and below:
 #if (__BORLANDC__ <= 0x564)

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

 #define BOOST_NO_AUTO_DECLARATIONS
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
@@ -185,8 +181,6 @@
 #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
@@ -281,4 +275,3 @@



-
--- a/include/boost/config/compiler/clang.hpp
+++ b/include/boost/config/compiler/clang.hpp
@@ -29,6 +29,7 @@
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
+#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR

 #if !__has_feature(cxx_decltype)
@@ -49,10 +50,8 @@

 #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_RVALUE_REFERENCES
--- a/include/boost/config/compiler/codegear.hpp
+++ b/include/boost/config/compiler/codegear.hpp
@@ -60,7 +60,7 @@
 // (Niels Dekker, LKEB, April 2010)
 #  define BOOST_NO_COMPLETE_VALUE_INITIALIZATION

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

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

 //
 // TR1 macros:
--- a/include/boost/config/compiler/common_edg.hpp
+++ b/include/boost/config/compiler/common_edg.hpp
@@ -74,6 +74,7 @@
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
+#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
 #define BOOST_NO_DEFAULTED_FUNCTIONS
@@ -81,7 +82,6 @@
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
 #define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #define BOOST_NO_LAMBDAS
-#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_NULLPTR
 #define BOOST_NO_RAW_LITERALS
 #define BOOST_NO_RVALUE_REFERENCES
@@ -91,7 +91,6 @@
 #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/digitalmars.hpp
+++ b/include/boost/config/compiler/digitalmars.hpp
@@ -44,9 +44,7 @@
 //
 // Is this really the best way to detect whether the std lib is in namespace std?
 //
-#ifdef __cplusplus
 #include <cstddef>
-#endif
 #if !defined(__STL_IMPORT_VENDOR_CSTD) && !defined(_STLP_IMPORT_VENDOR_CSTD)
 #  define BOOST_NO_STDC_NAMESPACE
 #endif
@@ -64,6 +62,7 @@
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
+#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
 #define BOOST_NO_DEFAULTED_FUNCTIONS
@@ -72,7 +71,6 @@
 #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
@@ -82,8 +80,6 @@
 #define BOOST_NO_TEMPLATE_ALIASES
 #define BOOST_NO_UNICODE_LITERALS
 #define BOOST_NO_VARIADIC_TEMPLATES
-#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
-
 #if (__DMC__ < 0x812)
 #define BOOST_NO_VARIADIC_MACROS
 #endif
--- a/include/boost/config/compiler/gcc.hpp
+++ b/include/boost/config/compiler/gcc.hpp
@@ -168,7 +168,7 @@

 // 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__))
+#  ifdef __VARIADIC_TEMPLATES
 #    define BOOST_HAS_VARIADIC_TMPL
 #  else
 #    define BOOST_NO_VARIADIC_TEMPLATES
@@ -182,16 +182,25 @@
 #  define BOOST_NO_AUTO_MULTIDECLARATIONS
 #  define BOOST_NO_CHAR16_T
 #  define BOOST_NO_CHAR32_T
-#  define BOOST_NO_INITIALIZER_LISTS
 #  define BOOST_NO_DEFAULTED_FUNCTIONS
 #  define BOOST_NO_DELETED_FUNCTIONS
+#  define BOOST_NO_INITIALIZER_LISTS
+#  define BOOST_NO_SCOPED_ENUMS  
 #endif

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

-// C++0x features in 4.5.0 and later
+// C++0x features in 4.4.1 and later
+//
+#if (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__ < 40401) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
+// scoped enums have a serious bug in 4.4.0, so define BOOST_NO_SCOPED_ENUMS before 4.4.1
+// See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38064
+#  define BOOST_NO_SCOPED_ENUMS
+#endif
+
+// C++0x features in 4.5.n and later
 //
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
 #  define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
@@ -200,25 +209,11 @@
 #  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_SCOPED_ENUMS before 4.5.1
-// See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38064
-#  define BOOST_NO_SCOPED_ENUMS
-#endif
-
-// C++0x features in 4.6.n and later
+// C++0x features in 4.5.n and later
 //
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
 #define BOOST_NO_CONSTEXPR
-#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_NULLPTR
-#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
-#endif
-
-#ifndef BOOST_COMPILER
-#  define BOOST_COMPILER "GNU C++ version " __VERSION__
 #endif

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

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

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

--- a/include/boost/config/compiler/hp_acc.hpp
+++ b/include/boost/config/compiler/hp_acc.hpp
@@ -96,6 +96,7 @@
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
+#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
 #define BOOST_NO_DEFAULTED_FUNCTIONS
@@ -105,7 +106,6 @@
 #define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #define BOOST_NO_INITIALIZER_LISTS
 #define BOOST_NO_LAMBDAS
-#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_NULLPTR
 #define BOOST_NO_RAW_LITERALS
 #define BOOST_NO_RVALUE_REFERENCES
--- a/include/boost/config/compiler/intel.hpp
+++ b/include/boost/config/compiler/intel.hpp
@@ -121,7 +121,6 @@
 // in type_traits code among other things, getting this correct
 // for the Intel compiler is actually remarkably fragile and tricky:
 //
-#ifdef __cplusplus
 #if defined(BOOST_NO_INTRINSIC_WCHAR_T)
 #include <cwchar>
 template< typename T > struct assert_no_intrinsic_wchar_t;
@@ -135,9 +134,8 @@ template<> struct assert_intrinsic_wchar_t<wchar_t> {};
 // if you see an error here then define BOOST_NO_INTRINSIC_WCHAR_T on the command line:
 template<> struct assert_intrinsic_wchar_t<unsigned short> {};
 #endif
-#endif

-#if defined(_MSC_VER) && (_MSC_VER+0 >= 1000)
+#if _MSC_VER+0 >= 1000
 #  if _MSC_VER >= 1200
 #     define BOOST_HAS_MS_INT64
 #  endif
@@ -211,7 +209,7 @@ template<> struct assert_intrinsic_wchar_t<unsigned short> {};

 #if defined(BOOST_INTEL_STDCXX0X) && (BOOST_INTEL_CXX_VERSION >= 1200)
 #  undef  BOOST_NO_RVALUE_REFERENCES
-//#  undef  BOOST_NO_SCOPED_ENUMS  // doesn't really work!!
+#  undef  BOOST_NO_SCOPED_ENUMS
 #  undef  BOOST_NO_DELETED_FUNCTIONS
 #  undef  BOOST_NO_DEFAULTED_FUNCTIONS
 #  undef  BOOST_NO_LAMBDAS
@@ -220,16 +218,9 @@ template<> struct assert_intrinsic_wchar_t<unsigned short> {};
 #  undef  BOOST_NO_AUTO_MULTIDECLARATIONS
 #endif

-#if (BOOST_INTEL_CXX_VERSION < 1200)
-//
-// fenv.h appears not to work with Intel prior to 12.0:
-//
-#  define BOOST_NO_FENV_H
-#endif
-
 //
 // last known and checked version:
-#if (BOOST_INTEL_CXX_VERSION > 1200)
+#if (BOOST_INTEL_CXX_VERSION > 1110)
 #  if defined(BOOST_ASSERT_CONFIG)
 #     error "Unknown compiler version - please run the configure tests and report the results"
 #  elif defined(_MSC_VER)
--- a/include/boost/config/compiler/metrowerks.hpp
+++ b/include/boost/config/compiler/metrowerks.hpp
@@ -96,6 +96,7 @@
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
+#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
 #define BOOST_NO_DEFAULTED_FUNCTIONS
@@ -105,7 +106,6 @@
 #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
@@ -115,7 +115,6 @@
 #define BOOST_NO_UNICODE_LITERALS
 #define BOOST_NO_VARIADIC_TEMPLATES
 #define BOOST_NO_VARIADIC_MACROS
-#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX

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

--- a/include/boost/config/compiler/mpw.hpp
+++ b/include/boost/config/compiler/mpw.hpp
@@ -44,6 +44,7 @@
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
+#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
 #define BOOST_NO_DEFAULTED_FUNCTIONS
@@ -53,7 +54,6 @@
 #define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #define BOOST_NO_INITIALIZER_LISTS
 #define BOOST_NO_LAMBDAS
-#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_NULLPTR
 #define BOOST_NO_RAW_LITERALS
 #define BOOST_NO_RVALUE_REFERENCES
@@ -64,7 +64,6 @@
 #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
@@ -43,7 +43,6 @@
 #  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
@@ -53,12 +52,12 @@
 #  define BOOST_NO_DEFAULTED_FUNCTIONS
 #  define BOOST_NO_DECLTYPE
 #  define BOOST_NO_CONSTEXPR
+#  define BOOST_NO_CONCEPTS
 #  define BOOST_NO_COMPLETE_VALUE_INITIALIZATION
 #  define BOOST_NO_CHAR32_T
 #  define BOOST_NO_CHAR16_T
 #  define BOOST_NO_AUTO_MULTIDECLARATIONS
 #  define BOOST_NO_AUTO_DECLARATIONS
-#  define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
 #  define BOOST_NO_0X_HDR_UNORDERED_SET
 #  define BOOST_NO_0X_HDR_UNORDERED_MAP
 #  define BOOST_NO_0X_HDR_TYPEINDEX
@@ -69,10 +68,14 @@
 #  define BOOST_NO_0X_HDR_RATIO
 #  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_MUTEX
+#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
+#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
 #  define BOOST_NO_0X_HDR_INITIALIZER_LIST
 #  define BOOST_NO_0X_HDR_FUTURE
 #  define BOOST_NO_0X_HDR_FORWARD_LIST
+#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
 #  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  define BOOST_NO_0X_HDR_CONCEPTS
 #  define BOOST_NO_0X_HDR_CODECVT
 #  define BOOST_NO_0X_HDR_CHRONO
 #endif
--- a/include/boost/config/compiler/pgi.hpp
+++ b/include/boost/config/compiler/pgi.hpp
@@ -51,6 +51,7 @@
 //
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
+#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
 #define BOOST_NO_DEFAULTED_FUNCTIONS
@@ -60,7 +61,6 @@
 #define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #define BOOST_NO_INITIALIZER_LISTS
 #define BOOST_NO_LAMBDAS
-#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_NULLPTR
 #define BOOST_NO_RAW_LITERALS
 #define BOOST_NO_RVALUE_REFERENCES
@@ -71,7 +71,6 @@
 #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
@@ -103,6 +103,7 @@
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
+#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
 #define BOOST_NO_DEFAULTED_FUNCTIONS
@@ -112,7 +113,6 @@
 #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
@@ -123,7 +123,6 @@
 #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
@@ -78,6 +78,7 @@
 #  define BOOST_NO_CHAR16_T
 #  define BOOST_NO_CHAR32_T
 #endif
+#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #if ! __IBMCPP_DECLTYPE
 #  define BOOST_NO_DECLTYPE
@@ -96,13 +97,11 @@
 #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_UNIFIED_INITIALIZATION_SYNTAX
 #if ! __IBMCPP_STATIC_ASSERT
 #  define BOOST_NO_STATIC_ASSERT
 #endif
--- a/include/boost/config/compiler/visualc.hpp
+++ b/include/boost/config/compiler/visualc.hpp
@@ -129,15 +129,11 @@
 #endif

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

-// we have ThreadEx or GetSystemTimeAsFileTime unless we're running WindowsCE
-#if !defined(_WIN32_WCE) && !defined(UNDER_CE)
-#  define BOOST_HAS_THREADEX
-#  define BOOST_HAS_GETSYSTEMTIMEASFILETIME
-#endif
-
 //   
 // check for exception handling support:   
 #if !defined(_CPPUNWIND) && !defined(BOOST_NO_EXCEPTIONS)
@@ -183,7 +179,6 @@
 #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
@@ -193,13 +188,14 @@
 // C++0x features not supported by any versions
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
+#define BOOST_NO_CONCEPTS
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DEFAULTED_FUNCTIONS
+#define BOOST_NO_DECLTYPE
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
 #define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #define BOOST_NO_INITIALIZER_LISTS
-#define BOOST_NO_NOEXCEPT
 #define BOOST_NO_RAW_LITERALS
 #define BOOST_NO_SCOPED_ENUMS
 #define BOOST_NO_TEMPLATE_ALIASES
@@ -207,7 +203,6 @@
 #define BOOST_NO_VARIADIC_TEMPLATES
 #define BOOST_NO_SFINAE_EXPR
 #define BOOST_NO_TWO_PHASE_NAME_LOOKUP
-#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
 //
 // prefix and suffix headers:
 //
--- a/include/boost/config/platform/linux.hpp
+++ b/include/boost/config/platform/linux.hpp
@@ -11,11 +11,7 @@
 #define BOOST_PLATFORM "linux"

 // make sure we have __GLIBC_PREREQ if available at all
-#ifdef __cplusplus
 #include <cstdlib>
-#else
-#include <stdlib.h>
-#endif

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

 #ifndef __GNUC__
 //
--- a/include/boost/config/platform/macos.hpp
+++ b/include/boost/config/platform/macos.hpp
@@ -64,17 +64,16 @@
 #  if ( defined(TARGET_API_MAC_CARBON) && TARGET_API_MAC_CARBON ) || ( defined(TARGET_CARBON) && TARGET_CARBON )

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

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

 // The remote call manager depends on this.
 #    define BOOST_BIND_ENABLE_PASCAL
--- a/include/boost/config/platform/symbian.hpp
+++ b/include/boost/config/platform/symbian.hpp
@@ -18,11 +18,8 @@
 // Open C / C++ plugin was introdused in this SDK, earlier versions don't have CRT / STL
 #  define BOOST_S60_3rd_EDITION_FP2_OR_LATER_SDK
 // make sure we have __GLIBC_PREREQ if available at all
-#ifdef __cplusplus
-#include <cstdlib>
-#else
-#include <stdlib.h>
-#endif// boilerplate code:
+#  include <cstdlib>
+// boilerplate code:
 #  define BOOST_HAS_UNISTD_H
 #  include <boost/config/posix_features.hpp>
 // S60 SDK defines _POSIX_VERSION as POSIX.1
--- a/include/boost/config/select_compiler_config.hpp
+++ b/include/boost/config/select_compiler_config.hpp
@@ -10,6 +10,33 @@

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

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

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

 #if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
 // STLPort library; this _must_ come first, otherwise since
--- a/include/boost/config/stdlib/dinkumware.hpp
+++ b/include/boost/config/stdlib/dinkumware.hpp
@@ -87,7 +87,7 @@
 #endif

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

@@ -101,6 +101,7 @@
 #  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_REGEX
 #  define BOOST_NO_0X_HDR_SYSTEM_ERROR
+#  define BOOST_NO_0X_HDR_TYPE_TRAITS
 #  define BOOST_NO_STD_UNORDERED        // deprecated; see following
 #  define BOOST_NO_0X_HDR_UNORDERED_MAP
 #  define BOOST_NO_0X_HDR_UNORDERED_SET
@@ -112,13 +113,16 @@
 #if !defined(_HAS_TR1_IMPORTS) && !defined(BOOST_NO_0X_HDR_TUPLE)
 #  define BOOST_NO_0X_HDR_TUPLE
 #endif
+
+//  C++0x headers not yet implemented
 //
-//  C++0x headers not yet (fully) implemented:
-//
-#  define BOOST_NO_0X_HDR_TYPE_TRAITS
 #  define BOOST_NO_0X_HDR_CHRONO
+#  define BOOST_NO_0X_HDR_CONCEPTS
 #  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
 #  define BOOST_NO_0X_HDR_FUTURE
+#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
+#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
 #  define BOOST_NO_0X_HDR_MUTEX
 #  define BOOST_NO_0X_HDR_RATIO
 #  define BOOST_NO_0X_HDR_THREAD
--- a/include/boost/config/stdlib/libcomo.hpp
+++ b/include/boost/config/stdlib/libcomo.hpp
@@ -38,10 +38,14 @@
 #  define BOOST_NO_0X_HDR_ARRAY
 #  define BOOST_NO_0X_HDR_CHRONO
 #  define BOOST_NO_0X_HDR_CODECVT
+#  define BOOST_NO_0X_HDR_CONCEPTS
 #  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
 #  define BOOST_NO_0X_HDR_FORWARD_LIST
 #  define BOOST_NO_0X_HDR_FUTURE
 #  define BOOST_NO_0X_HDR_INITIALIZER_LIST
+#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
+#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
 #  define BOOST_NO_0X_HDR_MUTEX
 #  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_RATIO
--- a/include/boost/config/stdlib/libcpp.hpp
+++ b/include/boost/config/stdlib/libcpp.hpp
@@ -19,17 +19,15 @@

 #define BOOST_HAS_THREADS

+#define BOOST_NO_0X_HDR_CONCEPTS
+#define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
+#define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
+#define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
+
 #ifdef _LIBCPP_HAS_NO_VARIADICS
 #    define BOOST_NO_0X_HDR_TUPLE
 #endif

-//
-// These appear to be unusable/incomplete so far:
-//
-#  define BOOST_NO_0X_HDR_CHRONO
-#  define BOOST_NO_0X_HDR_FUTURE
-#  define BOOST_NO_0X_HDR_TYPE_TRAITS
-
 // libc++ uses a non-standard messages_base
 #define BOOST_NO_STD_MESSAGES

--- a/include/boost/config/stdlib/libstdcpp3.hpp
+++ b/include/boost/config/stdlib/libstdcpp3.hpp
@@ -104,8 +104,10 @@
 //
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
 #  define BOOST_NO_0X_HDR_ARRAY
+#  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_REGEX
 #  define BOOST_NO_0X_HDR_TUPLE
+#  define BOOST_NO_0X_HDR_TYPE_TRAITS
 #  define BOOST_NO_STD_UNORDERED  // deprecated; see following
 #  define BOOST_NO_0X_HDR_UNORDERED_MAP
 #  define BOOST_NO_0X_HDR_UNORDERED_SET
@@ -121,33 +123,23 @@
 #  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_0X_HDR_CONDITION_VARIABLE) || !defined(BOOST_NO_0X_HDR_MUTEX))
-#  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
-#  define BOOST_NO_0X_HDR_MUTEX
+#  define BOOST_NO_0X_HDR_THREAD
 #endif

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

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

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

-#if _RWSTD_VER < 0x05000000
-#  define BOOST_NO_0X_HDR_ARRAY
-#endif
-// type_traits header is incomplete:
-#  define BOOST_NO_0X_HDR_TYPE_TRAITS
-//
 //  C++0x headers not yet implemented
 //
+#if _RWSTD_VER < 0x05000000
+#  define BOOST_NO_0X_HDR_ARRAY
+#  define BOOST_NO_0X_HDR_TYPE_TRAITS
+#endif
 #  define BOOST_NO_0X_HDR_CHRONO
 #  define BOOST_NO_0X_HDR_CODECVT
+#  define BOOST_NO_0X_HDR_CONCEPTS
 #  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
 #  define BOOST_NO_0X_HDR_FORWARD_LIST
 #  define BOOST_NO_0X_HDR_FUTURE
 #  define BOOST_NO_0X_HDR_INITIALIZER_LIST
+#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
+#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
 #  define BOOST_NO_0X_HDR_MUTEX
 #  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_RATIO
--- a/include/boost/config/stdlib/sgi.hpp
+++ b/include/boost/config/stdlib/sgi.hpp
@@ -121,10 +121,14 @@
 #  define BOOST_NO_0X_HDR_ARRAY
 #  define BOOST_NO_0X_HDR_CHRONO
 #  define BOOST_NO_0X_HDR_CODECVT
+#  define BOOST_NO_0X_HDR_CONCEPTS
 #  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
 #  define BOOST_NO_0X_HDR_FORWARD_LIST
 #  define BOOST_NO_0X_HDR_FUTURE
 #  define BOOST_NO_0X_HDR_INITIALIZER_LIST
+#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
+#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
 #  define BOOST_NO_0X_HDR_MUTEX
 #  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_RATIO
--- a/include/boost/config/stdlib/stlport.hpp
+++ b/include/boost/config/stdlib/stlport.hpp
@@ -215,10 +215,14 @@ namespace boost { using std::min; using std::max; }
 #  define BOOST_NO_0X_HDR_ARRAY
 #  define BOOST_NO_0X_HDR_CHRONO
 #  define BOOST_NO_0X_HDR_CODECVT
+#  define BOOST_NO_0X_HDR_CONCEPTS
 #  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
 #  define BOOST_NO_0X_HDR_FORWARD_LIST
 #  define BOOST_NO_0X_HDR_FUTURE
 #  define BOOST_NO_0X_HDR_INITIALIZER_LIST
+#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
+#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
 #  define BOOST_NO_0X_HDR_MUTEX
 #  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_RATIO
--- a/include/boost/config/stdlib/vacpp.hpp
+++ b/include/boost/config/stdlib/vacpp.hpp
@@ -27,10 +27,14 @@
 #  define BOOST_NO_0X_HDR_ARRAY
 #  define BOOST_NO_0X_HDR_CHRONO
 #  define BOOST_NO_0X_HDR_CODECVT
+#  define BOOST_NO_0X_HDR_CONCEPTS
 #  define BOOST_NO_0X_HDR_CONDITION_VARIABLE
+#  define BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
 #  define BOOST_NO_0X_HDR_FORWARD_LIST
 #  define BOOST_NO_0X_HDR_FUTURE
 #  define BOOST_NO_0X_HDR_INITIALIZER_LIST
+#  define BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
+#  define BOOST_NO_0X_HDR_MEMORY_CONCEPTS
 #  define BOOST_NO_0X_HDR_MUTEX
 #  define BOOST_NO_0X_HDR_RANDOM
 #  define BOOST_NO_0X_HDR_RATIO
--- a/include/boost/config/suffix.hpp
+++ b/include/boost/config/suffix.hpp
@@ -341,9 +341,6 @@
 #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
@@ -379,7 +376,7 @@
 //  works as expected with standard conforming compilers.  The resulting
 //  double inclusion of <cstddef> is harmless.

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

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

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

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


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

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

 // When BOOST_NO_STD_TYPEINFO is defined, we can just import
 // the global definition into std namespace:
-#if defined(BOOST_NO_STD_TYPEINFO) && defined(__cplusplus)
+#ifdef BOOST_NO_STD_TYPEINFO
 #include <typeinfo>
 namespace std{ using ::type_info; }
 #endif
--- a/include/boost/config/warning_disable.hpp
+++ b/include/boost/config/warning_disable.hpp
@@ -23,7 +23,7 @@
 //  Note that THIS HEADER MUST NOT INCLUDE ANY OTHER HEADERS:
 //  not even std library ones!  Doing so may turn the warning
 //  off too late to be of any use.  For example the VC++ C4996
-//  warning can be emitted from <iosfwd> if that header is included
+//  warning can be omitted from <iosfwd> if that header is included
 //  before or by this one :-(
 //

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

-#define BOOST_VERSION 104700
+#define BOOST_VERSION 104601

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

-#define BOOST_LIB_VERSION "1_47"
+#define BOOST_LIB_VERSION "1_46_1"

 #endif

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 namespace boost_no_0x_hdr_initializer_list {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-// from 5.19:
-constexpr const int* addr(const int& ir) { return &ir; }
-static const int x = 5;
-constexpr const int* xp = addr(x);
-
-struct A 
-{
-   constexpr A(int i) : val(i) { }
-   constexpr operator int() { return val; }
-   constexpr operator long() { return 43; }
-private:
-   int val;
-};
-
-template<int> struct X { };
-
-constexpr A a = 42;
-
-X<a> xx; // OK: unique conversion to int
-
 int test()
 {
  int i = square(5);
--- a/test/boost_no_defaulted_functions.ipp
+++ b/test/boost_no_defaulted_functions.ipp
@@ -10,10 +10,6 @@
 //  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 aren't really supported in non-C++0x mode
-#endif
-
 namespace boost_no_defaulted_functions {

  struct foo {
--- a/test/boost_no_deleted_functions.ipp
+++ b/test/boost_no_deleted_functions.ipp
@@ -10,10 +10,6 @@
 //  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 aren't really supported in non-C++0x mode
-#endif
-
 namespace boost_no_deleted_functions {

  struct foo {
--- a/test/boost_no_explicit_cvt_ops.ipp
+++ b/test/boost_no_explicit_cvt_ops.ipp
@@ -10,10 +10,6 @@
 //  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 isn't really available in non-C++0x mode
-#endif
-
 namespace boost_no_explicit_conversion_operators {

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

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

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

 namespace boost_no_fenv_h {

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

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

-  #if !defined(FE_ALL_EXCEPT)
-    #error platform does not define FE_ALL_EXCEPT
+  #if !defined(FE_INVALID)
+    #error platform does not define FE_INVALID
+  #endif
+  
+  #if !defined(FE_OVERFLOW)
+    #error platform does not define FE_OVERFLOW
  #endif

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

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

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

 #include <initializer_list>
 #include <vector>
-#include <string>

 namespace boost_no_initializer_lists {

--- a/test/boost_no_lambdas.ipp
+++ b/test/boost_no_lambdas.ipp
@@ -10,10 +10,6 @@
 //  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 isn't really available in non-C++0x mode
-#endif
-
 namespace boost_no_lambdas {

 int test()
--- a/test/boost_no_noexcept.ipp
+++ b/test/boost_no_noexcept.ipp
@@ -1,23 +0,0 @@
-//  Copyright (C) 2011 Takaya Saito
-//  Use, modification and distribution are subject to the
-//  Boost Software License, Version 1.0. (See accompanying file
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org/libs/config for most recent version.
-
-//  MACRO:         BOOST_NO_NOEXCEPT
-//  TITLE:         C++0x noexcept unavailable
-//  DESCRIPTION:   The compiler does not support C++0x noexcept
-
-namespace boost_no_noexcept {
-
-int f() noexcept ;
-int g() noexcept( noexcept( f() ) ) ;
-
-int test()
-{
-  bool b = noexcept( g() );
-  return 0;
-}
-
-}
--- a/test/boost_no_scoped_enums.ipp
+++ b/test/boost_no_scoped_enums.ipp
@@ -15,14 +15,7 @@ namespace boost_no_scoped_enums {
 int test()
 {
  enum class scoped_enum { yes, no, maybe };
-  // This tests bug http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38064
-  bool b = (scoped_enum::yes == scoped_enum::yes) 
-   && (scoped_enum::yes != scoped_enum::no) 
-   && (scoped_enum::yes < scoped_enum::no) 
-   && (scoped_enum::yes <= scoped_enum::no) 
-   && (scoped_enum::no > scoped_enum::yes) 
-   && (scoped_enum::no >= scoped_enum::yes);
-  return b ? 0 : 1;
+  return 0;
 }

 }
--- a/test/boost_no_unified_init.ipp
+++ b/test/boost_no_unified_init.ipp
@@ -1,53 +0,0 @@
-//  Copyright (C) 2011 John Maddock
-//  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_UNIFIED_INITIALIZATION_SYNTAX
-//  TITLE:         C++0x unified initialization syntax unavailable
-//  DESCRIPTION:   The compiler does not support C++0x unified initialization syntax: see http://en.wikipedia.org/wiki/C%2B%2B0x#Uniform_initialization
-
-namespace boost_no_unified_initialization_syntax {
-
-struct BasicStruct 
-{
-   int x;
-   double y;
-};
- 
-struct AltStruct 
-{
-public:
-   AltStruct(int x, double y) : x_{x}, y_{y} {}
-private:
-   int x_;
-   double y_;
-};
- 
-struct IdString 
-{
-   std::string name;
-   int identifier;
-   bool operator == (const IdString& other)
-   {
-      return identifier == other.identifier && name == other.name;
-   }
-};
- 
-IdString get_string()
-{
-   return {"SomeName", 4}; //Note the lack of explicit type.
-}
-
-int test()
-{
-   BasicStruct var1{5, 3.2};
-   AltStruct var2{2, 4.3};
-
-   IdString id{"SomeName", 4};
-   return id == get_string() ? 0 : 1;
-}
-
-}
--- a/test/config_info.cpp
+++ b/test/config_info.cpp
@@ -914,6 +914,7 @@ void print_boost_macros()
   PRINT_MACRO(BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL);
   PRINT_MACRO(BOOST_HAS_BETHREADS);
   PRINT_MACRO(BOOST_HAS_CLOCK_GETTIME);
+   PRINT_MACRO(BOOST_HAS_CONCEPTS);
   PRINT_MACRO(BOOST_HAS_DIRENT_H);
   PRINT_MACRO(BOOST_HAS_EXPM1);
   PRINT_MACRO(BOOST_HAS_FTIME);
@@ -965,10 +966,14 @@ void print_boost_macros()
   PRINT_MACRO(BOOST_NO_0X_HDR_ARRAY);
   PRINT_MACRO(BOOST_NO_0X_HDR_CHRONO);
   PRINT_MACRO(BOOST_NO_0X_HDR_CODECVT);
+   PRINT_MACRO(BOOST_NO_0X_HDR_CONCEPTS);
   PRINT_MACRO(BOOST_NO_0X_HDR_CONDITION_VARIABLE);
+   PRINT_MACRO(BOOST_NO_0X_HDR_CONTAINER_CONCEPTS);
   PRINT_MACRO(BOOST_NO_0X_HDR_FORWARD_LIST);
   PRINT_MACRO(BOOST_NO_0X_HDR_FUTURE);
   PRINT_MACRO(BOOST_NO_0X_HDR_INITIALIZER_LIST);
+   PRINT_MACRO(BOOST_NO_0X_HDR_ITERATOR_CONCEPTS);
+   PRINT_MACRO(BOOST_NO_0X_HDR_MEMORY_CONCEPTS);
   PRINT_MACRO(BOOST_NO_0X_HDR_MUTEX);
   PRINT_MACRO(BOOST_NO_0X_HDR_RANDOM);
   PRINT_MACRO(BOOST_NO_0X_HDR_RATIO);
@@ -989,6 +994,7 @@ void print_boost_macros()
   PRINT_MACRO(BOOST_NO_CHAR16_T);
   PRINT_MACRO(BOOST_NO_CHAR32_T);
   PRINT_MACRO(BOOST_NO_COMPLETE_VALUE_INITIALIZATION);
+   PRINT_MACRO(BOOST_NO_CONCEPTS);
   PRINT_MACRO(BOOST_NO_CONSTEXPR);
   PRINT_MACRO(BOOST_NO_CTYPE_FUNCTIONS);
   PRINT_MACRO(BOOST_NO_CV_SPECIALIZATIONS);
@@ -1005,7 +1011,6 @@ void print_boost_macros()
   PRINT_MACRO(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS);
   PRINT_MACRO(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS);
   PRINT_MACRO(BOOST_NO_EXTERN_TEMPLATE);
-   PRINT_MACRO(BOOST_NO_FENV_H);
   PRINT_MACRO(BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS);
   PRINT_MACRO(BOOST_NO_FUNCTION_TEMPLATE_ORDERING);
   PRINT_MACRO(BOOST_NO_FUNCTION_TYPE_SPECIALIZATIONS);
@@ -1027,7 +1032,6 @@ void print_boost_macros()
   PRINT_MACRO(BOOST_NO_MEMBER_TEMPLATE_KEYWORD);
   PRINT_MACRO(BOOST_NO_MS_INT64_NUMERIC_LIMITS);
   PRINT_MACRO(BOOST_NO_NESTED_FRIENDSHIP);
-   PRINT_MACRO(BOOST_NO_NOEXCEPT);
   PRINT_MACRO(BOOST_NO_NULLPTR);
   PRINT_MACRO(BOOST_NO_NUMERIC_LIMITS_LOWEST);
   PRINT_MACRO(BOOST_NO_OPERATORS_IN_NAMESPACE);
@@ -1067,7 +1071,6 @@ void print_boost_macros()
   PRINT_MACRO(BOOST_NO_TYPEID);
   PRINT_MACRO(BOOST_NO_TYPENAME_WITH_CTOR);
   PRINT_MACRO(BOOST_NO_UNICODE_LITERALS);
-   PRINT_MACRO(BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX);
   PRINT_MACRO(BOOST_NO_UNREACHABLE_RETURN_DETECTION);
   PRINT_MACRO(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE);
   PRINT_MACRO(BOOST_NO_USING_TEMPLATE);
@@ -1075,10 +1078,6 @@ void print_boost_macros()
   PRINT_MACRO(BOOST_NO_VARIADIC_TEMPLATES);
   PRINT_MACRO(BOOST_NO_VOID_RETURNS);

-
-
-
-
   // END GENERATED BLOCK

   PRINT_MACRO(BOOST_INTEL);
--- a/test/config_test.cpp
+++ b/test/config_test.cpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Mon May 09 12:11:18 2011
+//  This file was automatically generated on Sat Sep 25 16:53:42 2010
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-4.
 //  Use, modification and distribution are subject to the 
@@ -37,11 +37,21 @@ namespace boost_no_0x_hdr_chrono = empty_boost;
 #else
 namespace boost_no_0x_hdr_codecvt = empty_boost;
 #endif
+#ifndef BOOST_NO_0X_HDR_CONCEPTS
+#include "boost_no_0x_hdr_concepts.ipp"
+#else
+namespace boost_no_0x_hdr_concepts = empty_boost;
+#endif
 #ifndef BOOST_NO_0X_HDR_CONDITION_VARIABLE
 #include "boost_no_0x_hdr_condition_variable.ipp"
 #else
 namespace boost_no_0x_hdr_condition_variable = empty_boost;
 #endif
+#ifndef BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
+#include "boost_no_0x_hdr_container_concepts.ipp"
+#else
+namespace boost_no_0x_hdr_container_concepts = empty_boost;
+#endif
 #ifndef BOOST_NO_0X_HDR_FORWARD_LIST
 #include "boost_no_0x_hdr_forward_list.ipp"
 #else
@@ -57,6 +67,16 @@ namespace boost_no_0x_hdr_future = empty_boost;
 #else
 namespace boost_no_0x_hdr_initializer_list = empty_boost;
 #endif
+#ifndef BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
+#include "boost_no_0x_hdr_iterator_concepts.ipp"
+#else
+namespace boost_no_0x_hdr_iterator_concepts = empty_boost;
+#endif
+#ifndef BOOST_NO_0X_HDR_MEMORY_CONCEPTS
+#include "boost_no_0x_hdr_memory_concepts.ipp"
+#else
+namespace boost_no_0x_hdr_memory_concepts = empty_boost;
+#endif
 #ifndef BOOST_NO_0X_HDR_MUTEX
 #include "boost_no_0x_hdr_mutex.ipp"
 #else
@@ -162,6 +182,11 @@ namespace boost_no_char32_t = empty_boost;
 #else
 namespace boost_no_complete_value_initialization = empty_boost;
 #endif
+#ifndef BOOST_NO_CONCEPTS
+#include "boost_no_concepts.ipp"
+#else
+namespace boost_no_concepts = empty_boost;
+#endif
 #ifndef BOOST_NO_CONSTEXPR
 #include "boost_no_constexpr.ipp"
 #else
@@ -247,11 +272,6 @@ namespace boost_no_explicit_function_template_arguments = empty_boost;
 #else
 namespace boost_no_extern_template = empty_boost;
 #endif
-#ifndef BOOST_NO_FENV_H
-#include "boost_no_fenv_h.ipp"
-#else
-namespace boost_no_fenv_h = empty_boost;
-#endif
 #ifndef BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #include "boost_no_function_template_default_args.ipp"
 #else
@@ -367,11 +387,6 @@ namespace boost_no_pointer_to_member_template_parameters = empty_boost;
 #else
 namespace boost_no_nested_friendship = empty_boost;
 #endif
-#ifndef BOOST_NO_NOEXCEPT
-#include "boost_no_noexcept.ipp"
-#else
-namespace boost_no_noexcept = empty_boost;
-#endif
 #ifndef BOOST_NO_NULLPTR
 #include "boost_no_nullptr.ipp"
 #else
@@ -557,11 +572,6 @@ namespace boost_no_typename_with_ctor = empty_boost;
 #else
 namespace boost_no_unicode_literals = empty_boost;
 #endif
-#ifndef BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
-#include "boost_no_unified_init.ipp"
-#else
-namespace boost_no_unified_initialization_syntax = empty_boost;
-#endif
 #ifndef BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
 #include "boost_no_using_breaks_adl.ipp"
 #else
@@ -613,6 +623,11 @@ namespace boost_has_bethreads = empty_boost;
 #else
 namespace boost_has_clock_gettime = empty_boost;
 #endif
+#ifdef BOOST_HAS_CONCEPTS
+#include "boost_has_concepts.ipp"
+#else
+namespace boost_has_concepts = empty_boost;
+#endif
 #ifdef BOOST_HAS_DIRENT_H
 #include "boost_has_dirent_h.ipp"
 #else
@@ -866,6 +881,11 @@ int main( int, char *[] )
      std::cerr << "Failed test for BOOST_HAS_CLOCK_GETTIME at: " << __FILE__ << ":" << __LINE__ << std::endl;
      ++error_count;
   }
+   if(0 != boost_has_concepts::test())
+   {
+      std::cerr << "Failed test for BOOST_HAS_CONCEPTS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
   if(0 != boost_has_dirent_h::test())
   {
      std::cerr << "Failed test for BOOST_HAS_DIRENT_H at: " << __FILE__ << ":" << __LINE__ << std::endl;
@@ -1116,11 +1136,21 @@ int main( int, char *[] )
      std::cerr << "Failed test for BOOST_NO_0X_HDR_CODECVT at: " << __FILE__ << ":" << __LINE__ << std::endl;
      ++error_count;
   }
+   if(0 != boost_no_0x_hdr_concepts::test())
+   {
+      std::cerr << "Failed test for BOOST_NO_0X_HDR_CONCEPTS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
   if(0 != boost_no_0x_hdr_condition_variable::test())
   {
      std::cerr << "Failed test for BOOST_NO_0X_HDR_CONDITION_VARIABLE at: " << __FILE__ << ":" << __LINE__ << std::endl;
      ++error_count;
   }
+   if(0 != boost_no_0x_hdr_container_concepts::test())
+   {
+      std::cerr << "Failed test for BOOST_NO_0X_HDR_CONTAINER_CONCEPTS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
   if(0 != boost_no_0x_hdr_forward_list::test())
   {
      std::cerr << "Failed test for BOOST_NO_0X_HDR_FORWARD_LIST at: " << __FILE__ << ":" << __LINE__ << std::endl;
@@ -1136,6 +1166,16 @@ int main( int, char *[] )
      std::cerr << "Failed test for BOOST_NO_0X_HDR_INITIALIZER_LIST at: " << __FILE__ << ":" << __LINE__ << std::endl;
      ++error_count;
   }
+   if(0 != boost_no_0x_hdr_iterator_concepts::test())
+   {
+      std::cerr << "Failed test for BOOST_NO_0X_HDR_ITERATOR_CONCEPTS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
+   if(0 != boost_no_0x_hdr_memory_concepts::test())
+   {
+      std::cerr << "Failed test for BOOST_NO_0X_HDR_MEMORY_CONCEPTS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
   if(0 != boost_no_0x_hdr_mutex::test())
   {
      std::cerr << "Failed test for BOOST_NO_0X_HDR_MUTEX at: " << __FILE__ << ":" << __LINE__ << std::endl;
@@ -1241,6 +1281,11 @@ int main( int, char *[] )
      std::cerr << "Failed test for BOOST_NO_COMPLETE_VALUE_INITIALIZATION at: " << __FILE__ << ":" << __LINE__ << std::endl;
      ++error_count;
   }
+   if(0 != boost_no_concepts::test())
+   {
+      std::cerr << "Failed test for BOOST_NO_CONCEPTS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
   if(0 != boost_no_constexpr::test())
   {
      std::cerr << "Failed test for BOOST_NO_CONSTEXPR at: " << __FILE__ << ":" << __LINE__ << std::endl;
@@ -1326,11 +1371,6 @@ int main( int, char *[] )
      std::cerr << "Failed test for BOOST_NO_EXTERN_TEMPLATE at: " << __FILE__ << ":" << __LINE__ << std::endl;
      ++error_count;
   }
-   if(0 != boost_no_fenv_h::test())
-   {
-      std::cerr << "Failed test for BOOST_NO_FENV_H at: " << __FILE__ << ":" << __LINE__ << std::endl;
-      ++error_count;
-   }
   if(0 != boost_no_function_template_default_args::test())
   {
      std::cerr << "Failed test for BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS at: " << __FILE__ << ":" << __LINE__ << std::endl;
@@ -1446,11 +1486,6 @@ int main( int, char *[] )
      std::cerr << "Failed test for BOOST_NO_NESTED_FRIENDSHIP at: " << __FILE__ << ":" << __LINE__ << std::endl;
      ++error_count;
   }
-   if(0 != boost_no_noexcept::test())
-   {
-      std::cerr << "Failed test for BOOST_NO_NOEXCEPT at: " << __FILE__ << ":" << __LINE__ << std::endl;
-      ++error_count;
-   }
   if(0 != boost_no_nullptr::test())
   {
      std::cerr << "Failed test for BOOST_NO_NULLPTR at: " << __FILE__ << ":" << __LINE__ << std::endl;
@@ -1636,11 +1671,6 @@ int main( int, char *[] )
      std::cerr << "Failed test for BOOST_NO_UNICODE_LITERALS at: " << __FILE__ << ":" << __LINE__ << std::endl;
      ++error_count;
   }
-   if(0 != boost_no_unified_initialization_syntax::test())
-   {
-      std::cerr << "Failed test for BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX at: " << __FILE__ << ":" << __LINE__ << std::endl;
-      ++error_count;
-   }
   if(0 != boost_function_scope_using_declaration_breaks_adl::test())
   {
      std::cerr << "Failed test for BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL at: " << __FILE__ << ":" << __LINE__ << std::endl;
--- a/test/config_test_c.c
+++ b/test/config_test_c.c
@@ -1,9 +0,0 @@
-
-
-#include <boost/config.hpp>
-
-
-int main()
-{
-   return 0;
-}
--- a/test/has_concepts_fail.cpp
+++ b/test/has_concepts_fail.cpp
@@ -0,0 +1,34 @@
+//  This file was automatically generated on Sat Aug 25 12:32:20 2007
+//  by libs/config/tools/generate.cpp
+//  Copyright John Maddock 2002-4.
+//  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 the most recent version.
+
+// Test file for macro BOOST_HAS_CONCEPTS
+// This file should not compile, if it does then
+// BOOST_HAS_CONCEPTS should be defined.
+// See file boost_has_concepts.ipp for details
+
+// Must not have BOOST_ASSERT_CONFIG set; it defeats
+// the objective of this file:
+#ifdef BOOST_ASSERT_CONFIG
+#  undef BOOST_ASSERT_CONFIG
+#endif
+
+#include <boost/config.hpp>
+#include "test.hpp"
+
+#ifndef BOOST_HAS_CONCEPTS
+#include "boost_has_concepts.ipp"
+#else
+#error "this file should not compile"
+#endif
+
+int main( int, char *[] )
+{
+   return boost_has_concepts::test();
+}
+
--- a/test/has_concepts_pass.cpp
+++ b/test/has_concepts_pass.cpp
@@ -0,0 +1,34 @@
+//  This file was automatically generated on Sat Aug 25 12:32:20 2007
+//  by libs/config/tools/generate.cpp
+//  Copyright John Maddock 2002-4.
+//  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 the most recent version.
+
+// Test file for macro BOOST_HAS_CONCEPTS
+// This file should compile, if it does not then
+// BOOST_HAS_CONCEPTS should not be defined.
+// See file boost_has_concepts.ipp for details
+
+// Must not have BOOST_ASSERT_CONFIG set; it defeats
+// the objective of this file:
+#ifdef BOOST_ASSERT_CONFIG
+#  undef BOOST_ASSERT_CONFIG
+#endif
+
+#include <boost/config.hpp>
+#include "test.hpp"
+
+#ifdef BOOST_HAS_CONCEPTS
+#include "boost_has_concepts.ipp"
+#else
+namespace boost_has_concepts = empty_boost;
+#endif
+
+int main( int, char *[] )
+{
+   return boost_has_concepts::test();
+}
+
--- a/test/no_0x_hdr_concepts_fail.cpp
+++ b/test/no_0x_hdr_concepts_fail.cpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Mon May 09 12:11:17 2011
+//  This file was automatically generated on Fri May 15 11:57:42 2009
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-4.
 //  Use, modification and distribution are subject to the 
@@ -6,14 +6,14 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 //  See http://www.boost.org/libs/config for the most recent version.//
-//  Revision $Id: generate.cpp 70001 2011-03-15 13:17:46Z johnmaddock $
+//  Revision $Id$
 //


-// Test file for macro BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+// Test file for macro BOOST_NO_0X_HDR_CONCEPTS
 // This file should not compile, if it does then
-// BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX should not be defined.
-// See file boost_no_unified_init.ipp for details
+// BOOST_NO_0X_HDR_CONCEPTS should not be defined.
+// See file boost_no_0x_hdr_concepts.ipp for details

 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,14 +24,14 @@
 #include <boost/config.hpp>
 #include "test.hpp"

-#ifdef BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
-#include "boost_no_unified_init.ipp"
+#ifdef BOOST_NO_0X_HDR_CONCEPTS
+#include "boost_no_0x_hdr_concepts.ipp"
 #else
 #error "this file should not compile"
 #endif

 int main( int, char *[] )
 {
-   return boost_no_unified_initialization_syntax::test();
+   return boost_no_0x_hdr_concepts::test();
 }

--- a/test/no_0x_hdr_concepts_pass.cpp
+++ b/test/no_0x_hdr_concepts_pass.cpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Mon May 09 12:11:17 2011
+//  This file was automatically generated on Fri May 15 11:57:42 2009
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-4.
 //  Use, modification and distribution are subject to the 
@@ -6,14 +6,14 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 //  See http://www.boost.org/libs/config for the most recent version.//
-//  Revision $Id: generate.cpp 70001 2011-03-15 13:17:46Z johnmaddock $
+//  Revision $Id$
 //


-// Test file for macro BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+// Test file for macro BOOST_NO_0X_HDR_CONCEPTS
 // This file should compile, if it does not then
-// BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX should be defined.
-// See file boost_no_unified_init.ipp for details
+// BOOST_NO_0X_HDR_CONCEPTS should be defined.
+// See file boost_no_0x_hdr_concepts.ipp for details

 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,14 +24,14 @@
 #include <boost/config.hpp>
 #include "test.hpp"

-#ifndef BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
-#include "boost_no_unified_init.ipp"
+#ifndef BOOST_NO_0X_HDR_CONCEPTS
+#include "boost_no_0x_hdr_concepts.ipp"
 #else
-namespace boost_no_unified_initialization_syntax = empty_boost;
+namespace boost_no_0x_hdr_concepts = empty_boost;
 #endif

 int main( int, char *[] )
 {
-   return boost_no_unified_initialization_syntax::test();
+   return boost_no_0x_hdr_concepts::test();
 }

--- a/test/no_0x_hdr_container_concepts_fail.cpp
+++ b/test/no_0x_hdr_container_concepts_fail.cpp
@@ -0,0 +1,37 @@
+//  This file was automatically generated on Fri May 15 11:57:42 2009
+//  by libs/config/tools/generate.cpp
+//  Copyright John Maddock 2002-4.
+//  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 the most recent version.//
+//  Revision $Id$
+//
+
+
+// Test file for macro BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
+// This file should not compile, if it does then
+// BOOST_NO_0X_HDR_CONTAINER_CONCEPTS should not be defined.
+// See file boost_no_0x_hdr_container_concepts.ipp for details
+
+// Must not have BOOST_ASSERT_CONFIG set; it defeats
+// the objective of this file:
+#ifdef BOOST_ASSERT_CONFIG
+#  undef BOOST_ASSERT_CONFIG
+#endif
+
+#include <boost/config.hpp>
+#include "test.hpp"
+
+#ifdef BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
+#include "boost_no_0x_hdr_container_concepts.ipp"
+#else
+#error "this file should not compile"
+#endif
+
+int main( int, char *[] )
+{
+   return boost_no_0x_hdr_container_concepts::test();
+}
+
--- a/test/no_0x_hdr_container_concepts_pass.cpp
+++ b/test/no_0x_hdr_container_concepts_pass.cpp
@@ -0,0 +1,37 @@
+//  This file was automatically generated on Fri May 15 11:57:42 2009
+//  by libs/config/tools/generate.cpp
+//  Copyright John Maddock 2002-4.
+//  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 the most recent version.//
+//  Revision $Id$
+//
+
+
+// Test file for macro BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
+// This file should compile, if it does not then
+// BOOST_NO_0X_HDR_CONTAINER_CONCEPTS should be defined.
+// See file boost_no_0x_hdr_container_concepts.ipp for details
+
+// Must not have BOOST_ASSERT_CONFIG set; it defeats
+// the objective of this file:
+#ifdef BOOST_ASSERT_CONFIG
+#  undef BOOST_ASSERT_CONFIG
+#endif
+
+#include <boost/config.hpp>
+#include "test.hpp"
+
+#ifndef BOOST_NO_0X_HDR_CONTAINER_CONCEPTS
+#include "boost_no_0x_hdr_container_concepts.ipp"
+#else
+namespace boost_no_0x_hdr_container_concepts = empty_boost;
+#endif
+
+int main( int, char *[] )
+{
+   return boost_no_0x_hdr_container_concepts::test();
+}
+
--- a/test/no_0x_hdr_iterator_concepts_fail.cpp
+++ b/test/no_0x_hdr_iterator_concepts_fail.cpp
@@ -0,0 +1,37 @@
+//  This file was automatically generated on Fri May 15 11:57:42 2009
+//  by libs/config/tools/generate.cpp
+//  Copyright John Maddock 2002-4.
+//  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 the most recent version.//
+//  Revision $Id$
+//
+
+
+// Test file for macro BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
+// This file should not compile, if it does then
+// BOOST_NO_0X_HDR_ITERATOR_CONCEPTS should not be defined.
+// See file boost_no_0x_hdr_iterator_concepts.ipp for details
+
+// Must not have BOOST_ASSERT_CONFIG set; it defeats
+// the objective of this file:
+#ifdef BOOST_ASSERT_CONFIG
+#  undef BOOST_ASSERT_CONFIG
+#endif
+
+#include <boost/config.hpp>
+#include "test.hpp"
+
+#ifdef BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
+#include "boost_no_0x_hdr_iterator_concepts.ipp"
+#else
+#error "this file should not compile"
+#endif
+
+int main( int, char *[] )
+{
+   return boost_no_0x_hdr_iterator_concepts::test();
+}
+
--- a/test/no_0x_hdr_iterator_concepts_pass.cpp
+++ b/test/no_0x_hdr_iterator_concepts_pass.cpp
@@ -0,0 +1,37 @@
+//  This file was automatically generated on Fri May 15 11:57:42 2009
+//  by libs/config/tools/generate.cpp
+//  Copyright John Maddock 2002-4.
+//  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 the most recent version.//
+//  Revision $Id$
+//
+
+
+// Test file for macro BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
+// This file should compile, if it does not then
+// BOOST_NO_0X_HDR_ITERATOR_CONCEPTS should be defined.
+// See file boost_no_0x_hdr_iterator_concepts.ipp for details
+
+// Must not have BOOST_ASSERT_CONFIG set; it defeats
+// the objective of this file:
+#ifdef BOOST_ASSERT_CONFIG
+#  undef BOOST_ASSERT_CONFIG
+#endif
+
+#include <boost/config.hpp>
+#include "test.hpp"
+
+#ifndef BOOST_NO_0X_HDR_ITERATOR_CONCEPTS
+#include "boost_no_0x_hdr_iterator_concepts.ipp"
+#else
+namespace boost_no_0x_hdr_iterator_concepts = empty_boost;
+#endif
+
+int main( int, char *[] )
+{
+   return boost_no_0x_hdr_iterator_concepts::test();
+}
+
--- a/test/no_0x_hdr_memory_concepts_fail.cpp
+++ b/test/no_0x_hdr_memory_concepts_fail.cpp
@@ -0,0 +1,37 @@
+//  This file was automatically generated on Fri May 15 11:57:42 2009
+//  by libs/config/tools/generate.cpp
+//  Copyright John Maddock 2002-4.
+//  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 the most recent version.//
+//  Revision $Id$
+//
+
+
+// Test file for macro BOOST_NO_0X_HDR_MEMORY_CONCEPTS
+// This file should not compile, if it does then
+// BOOST_NO_0X_HDR_MEMORY_CONCEPTS should not be defined.
+// See file boost_no_0x_hdr_memory_concepts.ipp for details
+
+// Must not have BOOST_ASSERT_CONFIG set; it defeats
+// the objective of this file:
+#ifdef BOOST_ASSERT_CONFIG
+#  undef BOOST_ASSERT_CONFIG
+#endif
+
+#include <boost/config.hpp>
+#include "test.hpp"
+
+#ifdef BOOST_NO_0X_HDR_MEMORY_CONCEPTS
+#include "boost_no_0x_hdr_memory_concepts.ipp"
+#else
+#error "this file should not compile"
+#endif
+
+int main( int, char *[] )
+{
+   return boost_no_0x_hdr_memory_concepts::test();
+}
+
--- a/test/no_0x_hdr_memory_concepts_pass.cpp
+++ b/test/no_0x_hdr_memory_concepts_pass.cpp
@@ -0,0 +1,37 @@
+//  This file was automatically generated on Fri May 15 11:57:42 2009
+//  by libs/config/tools/generate.cpp
+//  Copyright John Maddock 2002-4.
+//  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 the most recent version.//
+//  Revision $Id$
+//
+
+
+// Test file for macro BOOST_NO_0X_HDR_MEMORY_CONCEPTS
+// This file should compile, if it does not then
+// BOOST_NO_0X_HDR_MEMORY_CONCEPTS should be defined.
+// See file boost_no_0x_hdr_memory_concepts.ipp for details
+
+// Must not have BOOST_ASSERT_CONFIG set; it defeats
+// the objective of this file:
+#ifdef BOOST_ASSERT_CONFIG
+#  undef BOOST_ASSERT_CONFIG
+#endif
+
+#include <boost/config.hpp>
+#include "test.hpp"
+
+#ifndef BOOST_NO_0X_HDR_MEMORY_CONCEPTS
+#include "boost_no_0x_hdr_memory_concepts.ipp"
+#else
+namespace boost_no_0x_hdr_memory_concepts = empty_boost;
+#endif
+
+int main( int, char *[] )
+{
+   return boost_no_0x_hdr_memory_concepts::test();
+}
+
--- a/test/no_concepts_fail.cpp
+++ b/test/no_concepts_fail.cpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Thu May  5 04:40:08 2011
+//  This file was automatically generated on Fri May 15 11:57:42 2009
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-4.
 //  Use, modification and distribution are subject to the 
@@ -10,10 +10,10 @@
 //


-// Test file for macro BOOST_NO_NOEXCEPT
+// Test file for macro BOOST_NO_CONCEPTS
 // This file should not compile, if it does then
-// BOOST_NO_NOEXCEPT should not be defined.
-// See file boost_no_noexcept.ipp for details
+// BOOST_NO_CONCEPTS should not be defined.
+// See file boost_no_concepts.ipp for details

 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,14 +24,14 @@
 #include <boost/config.hpp>
 #include "test.hpp"

-#ifdef BOOST_NO_NOEXCEPT
-#include "boost_no_noexcept.ipp"
+#ifdef BOOST_NO_CONCEPTS
+#include "boost_no_concepts.ipp"
 #else
 #error "this file should not compile"
 #endif

 int main( int, char *[] )
 {
-   return boost_no_noexcept::test();
+   return boost_no_concepts::test();
 }

--- a/test/no_concepts_pass.cpp
+++ b/test/no_concepts_pass.cpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Thu May  5 04:40:08 2011
+//  This file was automatically generated on Fri May 15 11:57:42 2009
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-4.
 //  Use, modification and distribution are subject to the 
@@ -10,10 +10,10 @@
 //


-// Test file for macro BOOST_NO_NOEXCEPT
+// Test file for macro BOOST_NO_CONCEPTS
 // This file should compile, if it does not then
-// BOOST_NO_NOEXCEPT should be defined.
-// See file boost_no_noexcept.ipp for details
+// BOOST_NO_CONCEPTS should be defined.
+// See file boost_no_concepts.ipp for details

 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,14 +24,14 @@
 #include <boost/config.hpp>
 #include "test.hpp"

-#ifndef BOOST_NO_NOEXCEPT
-#include "boost_no_noexcept.ipp"
+#ifndef BOOST_NO_CONCEPTS
+#include "boost_no_concepts.ipp"
 #else
-namespace boost_no_noexcept = empty_boost;
+namespace boost_no_concepts = empty_boost;
 #endif

 int main( int, char *[] )
 {
-   return boost_no_noexcept::test();
+   return boost_no_concepts::test();
 }

--- a/tools/generate.cpp
+++ b/tools/generate.cpp
@@ -124,7 +124,7 @@ void write_test_file(const fs::path& file,
 {
   if(!fs::exists(file))
   {
-      std::cout << "Writing test file " << file.string() << std::endl;
+      std::cout << "Writing test file " << file.native_directory_string() << std::endl;

      fs::ofstream ofs(file);
      std::time_t t = std::time(0);
@@ -180,13 +180,13 @@ void write_test_file(const fs::path& file,
   }
   else
   {
-      std::cout << "Skipping existing test file " << file.string() << std::endl;
+      std::cout << "Skipping existing test file " << file.native_directory_string() << std::endl;
   }
 }

 void process_ipp_file(const fs::path& file, bool positive_test)
 {
-   std::cout << "Info: Scanning file: " << file.string() << std::endl;
+   std::cout << "Info: Scanning file: " << file.native_directory_string() << std::endl;

   // our variables:
   std::string file_text;
@@ -210,7 +210,7 @@ void process_ipp_file(const fs::path& file, bool positive_test)
   }
   if(macro_name.empty())
   {
-      std::cout << "Error: no macro definition found in " << file.string();
+      std::cout << "Error: no macro definition found in " << file.native_directory_string();
   }
   else
   {
@@ -219,10 +219,10 @@ void process_ipp_file(const fs::path& file, bool positive_test)

   // get the output filesnames:
   boost::regex file_regex("boost_([^.]+)\\.ipp");
-   positive_file = file.branch_path() / boost::regex_replace(file.leaf().string(), file_regex, "$1_pass.cpp");
-   negative_file = file.branch_path() / boost::regex_replace(file.leaf().string(), file_regex, "$1_fail.cpp");
-   write_test_file(positive_file, macro_name, namespace_name, file.leaf().string(), positive_test, true);
-   write_test_file(negative_file, macro_name, namespace_name, file.leaf().string(), positive_test, false);
+   positive_file = file.branch_path() / boost::regex_replace(file.leaf(), file_regex, "$1_pass.cpp");
+   negative_file = file.branch_path() / boost::regex_replace(file.leaf(), file_regex, "$1_fail.cpp");
+   write_test_file(positive_file, macro_name, namespace_name, file.leaf(), positive_test, true);
+   write_test_file(negative_file, macro_name, namespace_name, file.leaf(), positive_test, false);
   
   // always create config_test data,
   // positive and negative tests go to separate streams, because for some
@@ -232,7 +232,7 @@ void process_ipp_file(const fs::path& file, bool positive_test)
   if(!positive_test)
      *pout << "n";
   *pout << "def " << macro_name 
-      << "\n#include \"" << file.leaf().string() << "\"\n#else\nnamespace "
+      << "\n#include \"" << file.leaf() << "\"\n#else\nnamespace "
      << namespace_name << " = empty_boost;\n#endif\n";

   config_test2 << "   if(0 != " << namespace_name << "::test())\n"
@@ -243,12 +243,12 @@ void process_ipp_file(const fs::path& file, bool positive_test)

   // always generate the jamfile data:
   jamfile << "test-suite \"" << macro_name << "\" : \n"
-      "[ run " << positive_file.leaf().string() << " <template>config_options ]\n"
-      "[ compile-fail " << negative_file.leaf().string() << " <template>config_options ] ;\n";
+      "[ run " << positive_file.leaf() << " <template>config_options ]\n"
+      "[ compile-fail " << negative_file.leaf() << " <template>config_options ] ;\n";

   jamfile_v2 << "test-suite \"" << macro_name << "\" : \n"
-      "[ run ../" << positive_file.leaf().string() << " ]\n"
-      "[ compile-fail ../" << negative_file.leaf().string() << " ] ;\n";
+      "[ run ../" << positive_file.leaf() << " ]\n"
+      "[ compile-fail ../" << negative_file.leaf() << " ] ;\n";

 }

@@ -268,7 +268,7 @@ int cpp_main(int argc, char* argv[])
      fs::path p(__FILE__, fs::native);
      config_path = p.branch_path().branch_path() / "test";
   }
-   std::cout << "Info: Boost.Config test path set as: " << config_path.string() << std::endl;
+   std::cout << "Info: Boost.Config test path set as: " << config_path.native_directory_string() << std::endl;

   // enumerate *.ipp files:
   boost::regex ipp_mask("boost_(?:(has)|no).*\\.ipp");
@@ -276,7 +276,7 @@ int cpp_main(int argc, char* argv[])
   fs::directory_iterator i(config_path), j;
   while(i != j)
   {
-      if(boost::regex_match(i->path().leaf().string(), ipp_match, ipp_mask))
+      if(boost::regex_match(i->path().leaf(), ipp_match, ipp_mask))
      {
         process_ipp_file(*i, ipp_match[1].matched);
      }