diff --git a/doc/html/boost_config/acknowledgements.html b/doc/html/boost_config/acknowledgements.html
index 2e961d14..17e711df 100644
--- a/doc/html/boost_config/acknowledgements.html
+++ b/doc/html/boost_config/acknowledgements.html
@@ -3,7 +3,7 @@
Acknowledgements
-
+
diff --git a/doc/html/boost_config/boost_macro_reference.html b/doc/html/boost_config/boost_macro_reference.html
index 04e2a8e4..9cba40a6 100644
--- a/doc/html/boost_config/boost_macro_reference.html
+++ b/doc/html/boost_config/boost_macro_reference.html
@@ -3,7 +3,7 @@
Boost Macro Reference
-
+
@@ -2573,7 +2573,7 @@
|
- BOOST_NO_AUTO_DECLARATIONS
+ BOOST_NO_CXX11_AUTO_DECLARATIONS
|
@@ -2588,7 +2588,7 @@
|
|
- BOOST_NO_AUTO_MULTIDECLARATIONS
+ BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
|
@@ -2605,7 +2605,7 @@
|
|
- BOOST_NO_CHAR16_T
+ BOOST_NO_CXX11_CHAR16_T
|
@@ -2617,7 +2617,7 @@
|
|
- BOOST_NO_CHAR32_T
+ BOOST_NO_CXX11_CHAR32_T
|
@@ -2629,7 +2629,7 @@
|
|
- BOOST_NO_TEMPLATE_ALIASES
+ BOOST_NO_CXX11_TEMPLATE_ALIASES
|
@@ -2641,7 +2641,7 @@
|
|
- BOOST_NO_CONSTEXPR
+ BOOST_NO_CXX11_CONSTEXPR
|
@@ -2653,7 +2653,7 @@
|
|
- BOOST_NO_DECLTYPE
+ BOOST_NO_CXX11_DECLTYPE
|
@@ -2665,7 +2665,7 @@
|
|
- BOOST_NO_DECLTYPE_N3276
+ BOOST_NO_CXX11_DECLTYPE_N3276
|
@@ -2679,7 +2679,7 @@
|
|
- BOOST_NO_DEFAULTED_FUNCTIONS
+ BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
|
@@ -2692,7 +2692,7 @@
|
|
- BOOST_NO_DELETED_FUNCTIONS
+ BOOST_NO_CXX11_DELETED_FUNCTIONS
|
@@ -2705,7 +2705,7 @@
|
|
- BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+ BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
|
@@ -2718,7 +2718,7 @@
|
|
- BOOST_NO_EXTERN_TEMPLATE
+ BOOST_NO_CXX11_EXTERN_TEMPLATE
|
@@ -2731,7 +2731,7 @@
|
|
- BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+ BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
|
@@ -2744,7 +2744,7 @@
|
|
- BOOST_NO_LAMBDAS
+ BOOST_NO_CXX11_LAMBDAS
|
@@ -2756,7 +2756,7 @@
|
|
- BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
+ BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
|
@@ -2783,7 +2783,7 @@
|
|
- BOOST_NO_NOEXCEPT
+ BOOST_NO_CXX11_NOEXCEPT
|
@@ -2795,7 +2795,7 @@
|
|
- BOOST_NO_NULLPTR
+ BOOST_NO_CXX11_NULLPTR
|
@@ -2807,7 +2807,7 @@
|
|
- BOOST_NO_RAW_LITERALS
+ BOOST_NO_CXX11_RAW_LITERALS
|
@@ -2819,7 +2819,7 @@
|
|
- BOOST_NO_RVALUE_REFERENCES
+ BOOST_NO_CXX11_RVALUE_REFERENCES
|
@@ -2831,7 +2831,7 @@
|
|
- BOOST_NO_SCOPED_ENUMS
+ BOOST_NO_CXX11_SCOPED_ENUMS
|
@@ -2843,7 +2843,7 @@
|
|
- BOOST_NO_STATIC_ASSERT
+ BOOST_NO_CXX11_STATIC_ASSERT
|
@@ -2855,7 +2855,7 @@
|
|
- BOOST_NO_STD_UNORDERD
+ BOOST_NO_CXX11_STD_UNORDERD
|
@@ -2868,7 +2868,7 @@
|
|
- BOOST_NO_UNICODE_LITERALS
+ BOOST_NO_CXX11_UNICODE_LITERALS
|
@@ -2881,7 +2881,7 @@
|
|
- BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+ BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
|
@@ -2894,7 +2894,7 @@
|
|
- BOOST_NO_VARIADIC_TEMPLATES
+ BOOST_NO_CXX11_VARIADIC_TEMPLATES
|
@@ -2906,7 +2906,7 @@
|
|
- BOOST_NO_VARIADIC_MACROS
+ BOOST_NO_CXX11_VARIADIC_MACROS
|
@@ -4155,6 +4155,529 @@
|
|
+
+|
+ |
+
+ |
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_AUTO_DECLARATIONS
+
+ |
+
+
+ BOOST_NO_CXX11_AUTO_DECLARATIONS
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_AUTO_MULTIDECLARATIONS
+
+ |
+
+
+ BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_CHAR16_T
+
+ |
+
+
+ BOOST_NO_CXX11_CHAR16_T
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_CHAR32_T
+
+ |
+
+
+ BOOST_NO_CXX11_CHAR32_T
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_TEMPLATE_ALIASES
+
+ |
+
+
+ BOOST_NO_CXX11_TEMPLATE_ALIASES
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_CONSTEXPR
+
+ |
+
+
+ BOOST_NO_CXX11_CONSTEXPR
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_DECLTYPE
+
+ |
+
+
+ BOOST_NO_CXX11_DECLTYPE
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_DECLTYPE_N3276
+
+ |
+
+
+ BOOST_NO_CXX11_DECLTYPE_N3276
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_DEFAULTED_FUNCTIONS
+
+ |
+
+
+ BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_DELETED_FUNCTIONS
+
+ |
+
+
+ BOOST_NO_CXX11_DELETED_FUNCTIONS
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+
+ |
+
+
+ BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_EXTERN_TEMPLATE
+
+ |
+
+
+ BOOST_NO_CXX11_EXTERN_TEMPLATE
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+
+ |
+
+
+ BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_LAMBDAS
+
+ |
+
+
+ BOOST_NO_CXX11_LAMBDAS
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
+
+ |
+
+
+ BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_LONG_LONG
+
+ |
+
+
+ BOOST_NO_CXX11_LONG_LONG
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_NOEXCEPT
+
+ |
+
+
+ BOOST_NO_CXX11_NOEXCEPT
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_NULLPTR
+
+ |
+
+
+ BOOST_NO_CXX11_NULLPTR
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_RAW_LITERALS
+
+ |
+
+
+ BOOST_NO_CXX11_RAW_LITERALS
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_RVALUE_REFERENCES
+
+ |
+
+
+ BOOST_NO_CXX11_RVALUE_REFERENCES
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_SCOPED_ENUMS
+
+ |
+
+
+ BOOST_NO_CXX11_SCOPED_ENUMS
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_STATIC_ASSERT
+
+ |
+
+
+ BOOST_NO_CXX11_STATIC_ASSERT
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_STD_UNORDERD
+
+ |
+
+
+ BOOST_NO_CXX11_STD_UNORDERD
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_UNICODE_LITERALS
+
+ |
+
+
+ BOOST_NO_CXX11_UNICODE_LITERALS
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+
+ |
+
+
+ BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_VARIADIC_TEMPLATES
+
+ |
+
+
+ BOOST_NO_CXX11_VARIADIC_TEMPLATES
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
+
+|
+
+ BOOST_NO_VARIADIC_MACROS
+
+ |
+
+
+ BOOST_NO_CXX11_VARIADIC_MACROS
+
+ |
+
+
+ Boost 1.51
+
+ |
+
+ |
+
diff --git a/doc/html/boost_config/guidelines_for_boost_authors.html b/doc/html/boost_config/guidelines_for_boost_authors.html
index e461783e..8fdc8f18 100644
--- a/doc/html/boost_config/guidelines_for_boost_authors.html
+++ b/doc/html/boost_config/guidelines_for_boost_authors.html
@@ -3,7 +3,7 @@
Guidelines for Boost Authors
-
+
diff --git a/doc/html/boost_config/rationale.html b/doc/html/boost_config/rationale.html
index cf175845..68dfc28a 100644
--- a/doc/html/boost_config/rationale.html
+++ b/doc/html/boost_config/rationale.html
@@ -3,7 +3,7 @@
Rationale
-
+
diff --git a/doc/html/index.html b/doc/html/index.html
index c951ce20..c3dbb281 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -3,7 +3,7 @@
Boost.Config
-
+
@@ -951,7 +951,7 @@
-Last revised: July 09, 2012 at 11:13:25 GMT |
+Last revised: July 09, 2012 at 22:23:04 GMT |
|
diff --git a/doc/macro_reference.qbk b/doc/macro_reference.qbk
index 762c6072..f1ccc362 100644
--- a/doc/macro_reference.qbk
+++ b/doc/macro_reference.qbk
@@ -561,83 +561,83 @@ that are not yet supported by a particular compiler or library.
[[`BOOST_NO_CXX11_HDR_UNORDERED_SET`][The standard library does not provide header .]]
[[`BOOST_NO_CXX11_SMART_PTR`][The standard library header has no shared_ptr and unique_ptr.]]
-[[`BOOST_NO_AUTO_DECLARATIONS`][The compiler does not support
+[[`BOOST_NO_CXX11_AUTO_DECLARATIONS`][The compiler does not support
type deduction for variables declared with the `auto` keyword (`auto var = ...;`).
]]
-[[`BOOST_NO_AUTO_MULTIDECLARATIONS`][The compiler does not support
+[[`BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS`][The compiler does not support
type deduction for multiple variables declared with the `auto` keyword (`auto var = ..., *ptr = ...;`).
]]
-[[`BOOST_NO_CHAR16_T`][The compiler does not support
+[[`BOOST_NO_CXX11_CHAR16_T`][The compiler does not support
type `char16_t`.
]]
-[[`BOOST_NO_CHAR32_T`][The compiler does not support
+[[`BOOST_NO_CXX11_CHAR32_T`][The compiler does not support
type `char32_t`.
]]
-[[`BOOST_NO_TEMPLATE_ALIASES`][The compiler does not support template aliases.
+[[`BOOST_NO_CXX11_TEMPLATE_ALIASES`][The compiler does not support template aliases.
]]
-[[`BOOST_NO_CONSTEXPR`][The compiler does not support
+[[`BOOST_NO_CXX11_CONSTEXPR`][The compiler does not support
`constexpr`.
]]
-[[`BOOST_NO_DECLTYPE`][The compiler does not support
+[[`BOOST_NO_CXX11_DECLTYPE`][The compiler does not support
`decltype`.
]]
-[[`BOOST_NO_DECLTYPE_N3276`][The compiler does not support the extension to
+[[`BOOST_NO_CXX11_DECLTYPE_N3276`][The compiler does not support the extension to
`decltype` described in [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3276.pdf N3276],
accepted in Madrid, March 2011.
]]
-[[`BOOST_NO_DEFAULTED_FUNCTIONS`][The compiler does not support
+[[`BOOST_NO_CXX11_DEFAULTED_FUNCTIONS`][The compiler does not support
defaulted (`= default`) functions.
]]
-[[`BOOST_NO_DELETED_FUNCTIONS`][The compiler does not support
+[[`BOOST_NO_CXX11_DELETED_FUNCTIONS`][The compiler does not support
deleted (`= delete`) functions.
]]
-[[`BOOST_NO_EXPLICIT_CONVERSION_OPERATORS`][The compiler does not support
+[[`BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS`][The compiler does not support
explicit conversion operators (`explicit operator T()`).
]]
-[[`BOOST_NO_EXTERN_TEMPLATE`][The compiler does not support
+[[`BOOST_NO_CXX11_EXTERN_TEMPLATE`][The compiler does not support
explicit instantiation forward declarations for templates (`extern template ...`).
]]
-[[`BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS`][The compiler does not support
+[[`BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS`][The compiler does not support
default template arguments for function templates.
]]
-[[`BOOST_NO_LAMBDAS`][The compiler does not support Lambdas.
+[[`BOOST_NO_CXX11_LAMBDAS`][The compiler does not support Lambdas.
]]
-[[`BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS`][The compiler does not allow to
+[[`BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS`][The compiler does not allow to
pass local classes as template parameters (this macro intentionally does not
control passing of unnamed types as template parameters, see also
[@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm N2657]).
]]
[[`BOOST_NO_LONG_LONG`][The compiler does not support `long long`.
]]
-[[`BOOST_NO_NOEXCEPT`][The compiler does not support `noexcept`.
+[[`BOOST_NO_CXX11_NOEXCEPT`][The compiler does not support `noexcept`.
]]
-[[`BOOST_NO_NULLPTR`][The compiler does not support `nullptr`.
+[[`BOOST_NO_CXX11_NULLPTR`][The compiler does not support `nullptr`.
]]
-[[`BOOST_NO_RAW_LITERALS`][The compiler does not support
+[[`BOOST_NO_CXX11_RAW_LITERALS`][The compiler does not support
raw string literals.
]]
-[[`BOOST_NO_RVALUE_REFERENCES`][The compiler does not support
+[[`BOOST_NO_CXX11_RVALUE_REFERENCES`][The compiler does not support
r-value references.
]]
-[[`BOOST_NO_SCOPED_ENUMS`][The compiler does not support
+[[`BOOST_NO_CXX11_SCOPED_ENUMS`][The compiler does not support
scoped enumerations (`enum class`).
]]
-[[`BOOST_NO_STATIC_ASSERT`][The compiler does not support
+[[`BOOST_NO_CXX11_STATIC_ASSERT`][The compiler does not support
`static_assert`.
]]
-[[`BOOST_NO_STD_UNORDERD`][The standard library does not support
+[[`BOOST_NO_CXX11_STD_UNORDERD`][The standard library does not support
and .
]]
-[[`BOOST_NO_UNICODE_LITERALS`][The compiler does not support
+[[`BOOST_NO_CXX11_UNICODE_LITERALS`][The compiler does not support
Unicode (`u8`, `u`, `U`) literals.
]]
-[[`BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX`][The compiler does not support
+[[`BOOST_NO_CXX11_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
+[[`BOOST_NO_CXX11_VARIADIC_TEMPLATES`][The compiler does not support
variadic templates.
]]
-[[`BOOST_NO_VARIADIC_MACROS`][The compiler does not support
+[[`BOOST_NO_CXX11_VARIADIC_MACROS`][The compiler does not support
variadic macros.
]]
]
@@ -1015,6 +1015,33 @@ They will be removed in a future version of boost.
[[`BOOST_NO_0X_HDR_UNORDERED_SET`][`BOOST_NO_CXX11_HDR_UNORDERED_SET`][Boost 1.50][]]
[[`BOOST_NO_0X_HDR_UNORDERED_MAP`][`BOOST_NO_CXX11_HDR_UNORDERED_MAP`][Boost 1.50][]]
[[`BOOST_NO_STD_UNORDERED`][`BOOST_NO_CXX11_HDR_UNORDERED_SET`][Boost 1.50][]]
+[[][][][]]
+[[`BOOST_NO_AUTO_DECLARATIONS`][`BOOST_NO_CXX11_AUTO_DECLARATIONS`][Boost 1.51][]]
+[[`BOOST_NO_AUTO_MULTIDECLARATIONS`][`BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS`][Boost 1.51][]]
+[[`BOOST_NO_CHAR16_T`][`BOOST_NO_CXX11_CHAR16_T`][Boost 1.51][]]
+[[`BOOST_NO_CHAR32_T`][`BOOST_NO_CXX11_CHAR32_T`][Boost 1.51][]]
+[[`BOOST_NO_TEMPLATE_ALIASES`][`BOOST_NO_CXX11_TEMPLATE_ALIASES`][Boost 1.51][]]
+[[`BOOST_NO_CONSTEXPR`][`BOOST_NO_CXX11_CONSTEXPR`][Boost 1.51][]]
+[[`BOOST_NO_DECLTYPE`][`BOOST_NO_CXX11_DECLTYPE`][Boost 1.51][]]
+[[`BOOST_NO_DECLTYPE_N3276`][`BOOST_NO_CXX11_DECLTYPE_N3276`][Boost 1.51][]]
+[[`BOOST_NO_DEFAULTED_FUNCTIONS`][`BOOST_NO_CXX11_DEFAULTED_FUNCTIONS`][Boost 1.51][]]
+[[`BOOST_NO_DELETED_FUNCTIONS`][`BOOST_NO_CXX11_DELETED_FUNCTIONS`][Boost 1.51][]]
+[[`BOOST_NO_EXPLICIT_CONVERSION_OPERATORS`][`BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS`][Boost 1.51][]]
+[[`BOOST_NO_EXTERN_TEMPLATE`][`BOOST_NO_CXX11_EXTERN_TEMPLATE`][Boost 1.51][]]
+[[`BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS`][`BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS`][Boost 1.51][]]
+[[`BOOST_NO_LAMBDAS`][`BOOST_NO_CXX11_LAMBDAS`][Boost 1.51][]]
+[[`BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS`][`BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS`][Boost 1.51][]]
+[[`BOOST_NO_NOEXCEPT`][`BOOST_NO_CXX11_NOEXCEPT`][Boost 1.51][]]
+[[`BOOST_NO_NULLPTR`][`BOOST_NO_CXX11_NULLPTR`][Boost 1.51][]]
+[[`BOOST_NO_RAW_LITERALS`][`BOOST_NO_CXX11_RAW_LITERALS`][Boost 1.51][]]
+[[`BOOST_NO_RVALUE_REFERENCES`][`BOOST_NO_CXX11_RVALUE_REFERENCES`][Boost 1.51][]]
+[[`BOOST_NO_SCOPED_ENUMS`][`BOOST_NO_CXX11_SCOPED_ENUMS`][Boost 1.51][]]
+[[`BOOST_NO_STATIC_ASSERT`][`BOOST_NO_CXX11_STATIC_ASSERT`][Boost 1.51][]]
+[[`BOOST_NO_STD_UNORDERD`][`BOOST_NO_CXX11_STD_UNORDERD`][Boost 1.51][]]
+[[`BOOST_NO_UNICODE_LITERALS`][`BOOST_NO_CXX11_UNICODE_LITERALS`][Boost 1.51][]]
+[[`BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX`][`BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX`][Boost 1.51][]]
+[[`BOOST_NO_VARIADIC_TEMPLATES`][`BOOST_NO_CXX11_VARIADIC_TEMPLATES`][Boost 1.51][]]
+[[`BOOST_NO_VARIADIC_MACROS`][`BOOST_NO_CXX11_VARIADIC_MACROS`][Boost 1.51][]]
]
[endsect]
diff --git a/include/boost/config/compiler/borland.hpp b/include/boost/config/compiler/borland.hpp
index 5917afd4..8057ac8e 100644
--- a/include/boost/config/compiler/borland.hpp
+++ b/include/boost/config/compiler/borland.hpp
@@ -47,7 +47,7 @@
# define BOOST_NO_OPERATORS_IN_NAMESPACE
# endif
// Variadic macros do not exist for C++ Builder versions 5 and below
-#define BOOST_NO_VARIADIC_MACROS
+#define BOOST_NO_CXX11_VARIADIC_MACROS
# endif
// Version 5.51 and below:
@@ -150,14 +150,14 @@
// C++0x Macros:
//
#if !defined( BOOST_CODEGEAR_0X_SUPPORT ) || (__BORLANDC__ < 0x610)
-# define BOOST_NO_CHAR16_T
-# define BOOST_NO_CHAR32_T
-# define BOOST_NO_DECLTYPE
-# define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-# define BOOST_NO_EXTERN_TEMPLATE
-# define BOOST_NO_RVALUE_REFERENCES
-# define BOOST_NO_SCOPED_ENUMS
-# define BOOST_NO_STATIC_ASSERT
+# define BOOST_NO_CXX11_CHAR16_T
+# define BOOST_NO_CXX11_CHAR32_T
+# define BOOST_NO_CXX11_DECLTYPE
+# define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+# define BOOST_NO_CXX11_EXTERN_TEMPLATE
+# define BOOST_NO_CXX11_RVALUE_REFERENCES
+# define BOOST_NO_CXX11_SCOPED_ENUMS
+# define BOOST_NO_CXX11_STATIC_ASSERT
#else
# define BOOST_HAS_ALIGNOF
# define BOOST_HAS_CHAR16_T
@@ -169,26 +169,26 @@
# define BOOST_HAS_STATIC_ASSERT
#endif
-#define BOOST_NO_AUTO_DECLARATIONS
-#define BOOST_NO_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CONSTEXPR
-#define BOOST_NO_DECLTYPE_N3276
-#define BOOST_NO_DEFAULTED_FUNCTIONS
-#define BOOST_NO_DELETED_FUNCTIONS
-#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#define BOOST_NO_CXX11_AUTO_DECLARATIONS
+#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CXX11_CONSTEXPR
+#define BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+#define BOOST_NO_CXX11_DELETED_FUNCTIONS
+#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#define BOOST_NO_LAMBDAS
-#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_NULLPTR
-#define BOOST_NO_RAW_LITERALS
-#define BOOST_NO_RVALUE_REFERENCES
-#define BOOST_NO_SCOPED_ENUMS
+#define BOOST_NO_CXX11_LAMBDAS
+#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#define BOOST_NO_CXX11_NULLPTR
+#define BOOST_NO_CXX11_RAW_LITERALS
+#define BOOST_NO_CXX11_RVALUE_REFERENCES
+#define BOOST_NO_CXX11_SCOPED_ENUMS
#define BOOST_NO_SFINAE_EXPR
-#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
+#define BOOST_NO_CXX11_TEMPLATE_ALIASES
+#define BOOST_NO_CXX11_UNICODE_LITERALS // UTF-8 still not supported
+#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+#define BOOST_NO_CXX11_NOEXCEPT
+#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#if __BORLANDC__ >= 0x590
# define BOOST_HAS_TR1_HASH
diff --git a/include/boost/config/compiler/clang.hpp b/include/boost/config/compiler/clang.hpp
index 1067a800..d0e8edfd 100644
--- a/include/boost/config/compiler/clang.hpp
+++ b/include/boost/config/compiler/clang.hpp
@@ -30,41 +30,41 @@
#define BOOST_HAS_LONG_LONG
#if !__has_feature(cxx_auto_type)
-# define BOOST_NO_AUTO_DECLARATIONS
-# define BOOST_NO_AUTO_MULTIDECLARATIONS
+# define BOOST_NO_CXX11_AUTO_DECLARATIONS
+# define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
#endif
#if !(defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L)
-# define BOOST_NO_CHAR16_T
-# define BOOST_NO_CHAR32_T
+# define BOOST_NO_CXX11_CHAR16_T
+# define BOOST_NO_CXX11_CHAR32_T
#endif
#if !__has_feature(cxx_constexpr)
-# define BOOST_NO_CONSTEXPR
+# define BOOST_NO_CXX11_CONSTEXPR
#endif
#if !__has_feature(cxx_decltype)
-# define BOOST_NO_DECLTYPE
+# define BOOST_NO_CXX11_DECLTYPE
#endif
#if !__has_feature(cxx_decltype_incomplete_return_types)
-# define BOOST_NO_DECLTYPE_N3276
+# define BOOST_NO_CXX11_DECLTYPE_N3276
#endif
#if !__has_feature(cxx_defaulted_functions)
-# define BOOST_NO_DEFAULTED_FUNCTIONS
+# define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
#endif
#if !__has_feature(cxx_deleted_functions)
-# define BOOST_NO_DELETED_FUNCTIONS
+# define BOOST_NO_CXX11_DELETED_FUNCTIONS
#endif
#if !__has_feature(cxx_explicit_conversions)
-# define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+# define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
#endif
#if !__has_feature(cxx_default_function_template_args)
-# define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+# define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
#endif
#if !__has_feature(cxx_generalized_initializers)
@@ -72,51 +72,51 @@
#endif
#if !__has_feature(cxx_lambdas)
-# define BOOST_NO_LAMBDAS
+# define BOOST_NO_CXX11_LAMBDAS
#endif
#if !__has_feature(cxx_local_type_template_args)
-# define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
+# define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
#endif
#if !__has_feature(cxx_noexcept)
-# define BOOST_NO_NOEXCEPT
+# define BOOST_NO_CXX11_NOEXCEPT
#endif
#if !__has_feature(cxx_nullptr)
-# define BOOST_NO_NULLPTR
+# define BOOST_NO_CXX11_NULLPTR
#endif
#if !__has_feature(cxx_raw_string_literals)
-# define BOOST_NO_RAW_LITERALS
+# define BOOST_NO_CXX11_RAW_LITERALS
#endif
#if !__has_feature(cxx_generalized_initializers)
-# define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+# define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#endif
#if !__has_feature(cxx_rvalue_references)
-# define BOOST_NO_RVALUE_REFERENCES
+# define BOOST_NO_CXX11_RVALUE_REFERENCES
#endif
#if !__has_feature(cxx_strong_enums)
-# define BOOST_NO_SCOPED_ENUMS
+# define BOOST_NO_CXX11_SCOPED_ENUMS
#endif
#if !__has_feature(cxx_static_assert)
-# define BOOST_NO_STATIC_ASSERT
+# define BOOST_NO_CXX11_STATIC_ASSERT
#endif
#if !__has_feature(cxx_alias_templates)
-# define BOOST_NO_TEMPLATE_ALIASES
+# define BOOST_NO_CXX11_TEMPLATE_ALIASES
#endif
#if !__has_feature(cxx_unicode_literals)
-# define BOOST_NO_UNICODE_LITERALS
+# define BOOST_NO_CXX11_UNICODE_LITERALS
#endif
#if !__has_feature(cxx_variadic_templates)
-# define BOOST_NO_VARIADIC_TEMPLATES
+# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
#endif
// Clang always supports variadic macros
diff --git a/include/boost/config/compiler/codegear.hpp b/include/boost/config/compiler/codegear.hpp
index 27040049..f53926c9 100644
--- a/include/boost/config/compiler/codegear.hpp
+++ b/include/boost/config/compiler/codegear.hpp
@@ -76,7 +76,7 @@
// C++0x macros:
//
#if (__CODEGEARC__ <= 0x620)
-#define BOOST_NO_STATIC_ASSERT
+#define BOOST_NO_CXX11_STATIC_ASSERT
#else
#define BOOST_HAS_STATIC_ASSERT
#endif
@@ -91,24 +91,24 @@
// #define BOOST_HAS_STATIC_ASSERT
#define BOOST_HAS_STD_TYPE_TRAITS
-#define BOOST_NO_AUTO_DECLARATIONS
-#define BOOST_NO_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CONSTEXPR
-#define BOOST_NO_DEFAULTED_FUNCTIONS
-#define BOOST_NO_DELETED_FUNCTIONS
-#define BOOST_NO_EXTERN_TEMPLATE
-#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_LAMBDAS
-#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_NOEXCEPT
-#define BOOST_NO_NULLPTR
-#define BOOST_NO_RAW_LITERALS
-#define BOOST_NO_RVALUE_REFERENCES
+#define BOOST_NO_CXX11_AUTO_DECLARATIONS
+#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CXX11_CONSTEXPR
+#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+#define BOOST_NO_CXX11_DELETED_FUNCTIONS
+#define BOOST_NO_CXX11_EXTERN_TEMPLATE
+#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#define BOOST_NO_CXX11_LAMBDAS
+#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#define BOOST_NO_CXX11_NOEXCEPT
+#define BOOST_NO_CXX11_NULLPTR
+#define BOOST_NO_CXX11_RAW_LITERALS
+#define BOOST_NO_CXX11_RVALUE_REFERENCES
#define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_TEMPLATE_ALIASES
-#define BOOST_NO_UNICODE_LITERALS
-#define BOOST_NO_VARIADIC_TEMPLATES
-#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#define BOOST_NO_CXX11_TEMPLATE_ALIASES
+#define BOOST_NO_CXX11_UNICODE_LITERALS
+#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
//
// TR1 macros:
diff --git a/include/boost/config/compiler/common_edg.hpp b/include/boost/config/compiler/common_edg.hpp
index a615a35b..5832e558 100644
--- a/include/boost/config/compiler/common_edg.hpp
+++ b/include/boost/config/compiler/common_edg.hpp
@@ -60,40 +60,40 @@
// See above for BOOST_NO_LONG_LONG
//
#if (__EDG_VERSION__ < 310)
-# define BOOST_NO_EXTERN_TEMPLATE
+# define BOOST_NO_CXX11_EXTERN_TEMPLATE
#endif
#if (__EDG_VERSION__ <= 310)
// No support for initializer lists
# define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
#endif
#if (__EDG_VERSION__ < 400)
-# define BOOST_NO_VARIADIC_MACROS
+# define BOOST_NO_CXX11_VARIADIC_MACROS
#endif
-#define BOOST_NO_AUTO_DECLARATIONS
-#define BOOST_NO_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CHAR16_T
-#define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONSTEXPR
-#define BOOST_NO_DECLTYPE
-#define BOOST_NO_DECLTYPE_N3276
-#define BOOST_NO_DEFAULTED_FUNCTIONS
-#define BOOST_NO_DELETED_FUNCTIONS
-#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_LAMBDAS
-#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#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_CXX11_AUTO_DECLARATIONS
+#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CXX11_CHAR16_T
+#define BOOST_NO_CXX11_CHAR32_T
+#define BOOST_NO_CXX11_CONSTEXPR
+#define BOOST_NO_CXX11_DECLTYPE
+#define BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+#define BOOST_NO_CXX11_DELETED_FUNCTIONS
+#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#define BOOST_NO_CXX11_LAMBDAS
+#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#define BOOST_NO_CXX11_NOEXCEPT
+#define BOOST_NO_CXX11_NULLPTR
+#define BOOST_NO_CXX11_RAW_LITERALS
+#define BOOST_NO_CXX11_RVALUE_REFERENCES
+#define BOOST_NO_CXX11_SCOPED_ENUMS
#define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_STATIC_ASSERT
-#define BOOST_NO_TEMPLATE_ALIASES
-#define BOOST_NO_UNICODE_LITERALS
-#define BOOST_NO_VARIADIC_TEMPLATES
-#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#define BOOST_NO_CXX11_STATIC_ASSERT
+#define BOOST_NO_CXX11_TEMPLATE_ALIASES
+#define BOOST_NO_CXX11_UNICODE_LITERALS
+#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#ifdef c_plusplus
// EDG has "long long" in non-strict mode
diff --git a/include/boost/config/compiler/cray.hpp b/include/boost/config/compiler/cray.hpp
index 134275e5..d6f07848 100644
--- a/include/boost/config/compiler/cray.hpp
+++ b/include/boost/config/compiler/cray.hpp
@@ -25,34 +25,34 @@
//
// Cray peculiarities, probably version 7 specific:
//
-#undef BOOST_NO_AUTO_DECLARATIONS
-#undef BOOST_NO_AUTO_MULTIDECLARATIONS
+#undef BOOST_NO_CXX11_AUTO_DECLARATIONS
+#undef BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
#define BOOST_HAS_NRVO
-#define BOOST_NO_VARIADIC_TEMPLATES
-#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
-#define BOOST_NO_UNICODE_LITERALS
+#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
+#define BOOST_NO_CXX11_UNICODE_LITERALS
#define BOOST_NO_TWO_PHASE_NAME_LOOKUP
#define BOOST_HAS_NRVO
-#define BOOST_NO_TEMPLATE_ALIASES
-#define BOOST_NO_STATIC_ASSERT
+#define BOOST_NO_CXX11_TEMPLATE_ALIASES
+#define BOOST_NO_CXX11_STATIC_ASSERT
#define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_SCOPED_ENUMS
-#define BOOST_NO_RVALUE_REFERENCES
-#define BOOST_NO_RAW_LITERALS
-#define BOOST_NO_NULLPTR
-#define BOOST_NO_NOEXCEPT
-#define BOOST_NO_LAMBDAS
-#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_DELETED_FUNCTIONS
-#define BOOST_NO_DEFAULTED_FUNCTIONS
-#define BOOST_NO_DECLTYPE_N3276
-#define BOOST_NO_DECLTYPE
-#define BOOST_NO_CONSTEXPR
+#define BOOST_NO_CXX11_SCOPED_ENUMS
+#define BOOST_NO_CXX11_RVALUE_REFERENCES
+#define BOOST_NO_CXX11_RAW_LITERALS
+#define BOOST_NO_CXX11_NULLPTR
+#define BOOST_NO_CXX11_NOEXCEPT
+#define BOOST_NO_CXX11_LAMBDAS
+#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+#define BOOST_NO_CXX11_DELETED_FUNCTIONS
+#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+#define BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_NO_CXX11_DECLTYPE
+#define BOOST_NO_CXX11_CONSTEXPR
#define BOOST_NO_COMPLETE_VALUE_INITIALIZATION
-#define BOOST_NO_CHAR32_T
-#define BOOST_NO_CHAR16_T
+#define BOOST_NO_CXX11_CHAR32_T
+#define BOOST_NO_CXX11_CHAR16_T
//#define BOOST_BCB_PARTIAL_SPECIALIZATION_BUG
#define BOOST_MATH_DISABLE_STD_FPCLASSIFY
//#define BOOST_HAS_FPCLASSIFY
diff --git a/include/boost/config/compiler/digitalmars.hpp b/include/boost/config/compiler/digitalmars.hpp
index 7386be7d..ffa9545a 100644
--- a/include/boost/config/compiler/digitalmars.hpp
+++ b/include/boost/config/compiler/digitalmars.hpp
@@ -60,34 +60,34 @@
//
// C++0x features
//
-#define BOOST_NO_AUTO_DECLARATIONS
-#define BOOST_NO_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CHAR16_T
-#define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONSTEXPR
-#define BOOST_NO_DECLTYPE
-#define BOOST_NO_DECLTYPE_N3276
-#define BOOST_NO_DEFAULTED_FUNCTIONS
-#define BOOST_NO_DELETED_FUNCTIONS
-#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_EXTERN_TEMPLATE
+#define BOOST_NO_CXX11_AUTO_DECLARATIONS
+#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CXX11_CHAR16_T
+#define BOOST_NO_CXX11_CHAR32_T
+#define BOOST_NO_CXX11_CONSTEXPR
+#define BOOST_NO_CXX11_DECLTYPE
+#define BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+#define BOOST_NO_CXX11_DELETED_FUNCTIONS
+#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+#define BOOST_NO_CXX11_EXTERN_TEMPLATE
#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#define BOOST_NO_LAMBDAS
-#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#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_CXX11_LAMBDAS
+#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#define BOOST_NO_CXX11_NOEXCEPT
+#define BOOST_NO_CXX11_NULLPTR
+#define BOOST_NO_CXX11_RAW_LITERALS
+#define BOOST_NO_CXX11_RVALUE_REFERENCES
+#define BOOST_NO_CXX11_SCOPED_ENUMS
#define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_STATIC_ASSERT
-#define BOOST_NO_TEMPLATE_ALIASES
-#define BOOST_NO_UNICODE_LITERALS
-#define BOOST_NO_VARIADIC_TEMPLATES
-#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#define BOOST_NO_CXX11_STATIC_ASSERT
+#define BOOST_NO_CXX11_TEMPLATE_ALIASES
+#define BOOST_NO_CXX11_UNICODE_LITERALS
+#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#if (__DMC__ < 0x812)
-#define BOOST_NO_VARIADIC_MACROS
+#define BOOST_NO_CXX11_VARIADIC_MACROS
#endif
#if __DMC__ < 0x800
diff --git a/include/boost/config/compiler/gcc.hpp b/include/boost/config/compiler/gcc.hpp
index 5d9c75a2..d2c111bd 100644
--- a/include/boost/config/compiler/gcc.hpp
+++ b/include/boost/config/compiler/gcc.hpp
@@ -42,9 +42,9 @@
# define BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE
# define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
# define BOOST_NO_IS_ABSTRACT
-# define BOOST_NO_EXTERN_TEMPLATE
+# define BOOST_NO_CXX11_EXTERN_TEMPLATE
// Variadic macros do not exist for gcc versions before 3.0
-# define BOOST_NO_VARIADIC_MACROS
+# define BOOST_NO_CXX11_VARIADIC_MACROS
#elif __GNUC__ == 3
# if defined (__PATHSCALE__)
# define BOOST_NO_TWO_PHASE_NAME_LOOKUP
@@ -61,7 +61,7 @@
# if __GNUC_MINOR__ < 4
# define BOOST_NO_IS_ABSTRACT
# endif
-# define BOOST_NO_EXTERN_TEMPLATE
+# define BOOST_NO_CXX11_EXTERN_TEMPLATE
#endif
#if __GNUC__ < 4
//
@@ -158,30 +158,30 @@
# define BOOST_HAS_STATIC_ASSERT
# define BOOST_HAS_VARIADIC_TMPL
#else
-# define BOOST_NO_DECLTYPE
-# define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-# define BOOST_NO_RVALUE_REFERENCES
-# define BOOST_NO_STATIC_ASSERT
+# define BOOST_NO_CXX11_DECLTYPE
+# define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
+# define BOOST_NO_CXX11_RVALUE_REFERENCES
+# define BOOST_NO_CXX11_STATIC_ASSERT
// Variadic templates compiler:
// http://www.generic-programming.org/~dgregor/cpp/variadic-templates.html
# if defined(__VARIADIC_TEMPLATES) || (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4) && defined(__GXX_EXPERIMENTAL_CXX0X__))
# define BOOST_HAS_VARIADIC_TMPL
# else
-# define BOOST_NO_VARIADIC_TEMPLATES
+# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
# endif
#endif
// C++0x features in 4.4.n and later
//
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
-# define BOOST_NO_AUTO_DECLARATIONS
-# define BOOST_NO_AUTO_MULTIDECLARATIONS
-# define BOOST_NO_CHAR16_T
-# define BOOST_NO_CHAR32_T
+# define BOOST_NO_CXX11_AUTO_DECLARATIONS
+# define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+# define BOOST_NO_CXX11_CHAR16_T
+# define BOOST_NO_CXX11_CHAR32_T
# define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-# define BOOST_NO_DEFAULTED_FUNCTIONS
-# define BOOST_NO_DELETED_FUNCTIONS
+# define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+# define BOOST_NO_CXX11_DELETED_FUNCTIONS
#endif
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4)
@@ -191,36 +191,36 @@
// C++0x features in 4.5.0 and later
//
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
-# define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-# define BOOST_NO_LAMBDAS
-# define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-# define BOOST_NO_RAW_LITERALS
-# define BOOST_NO_UNICODE_LITERALS
+# define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+# define BOOST_NO_CXX11_LAMBDAS
+# define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+# define BOOST_NO_CXX11_RAW_LITERALS
+# define BOOST_NO_CXX11_UNICODE_LITERALS
#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
+// scoped enums have a serious bug in 4.4.0, so define BOOST_NO_CXX11_SCOPED_ENUMS before 4.5.1
// See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38064
-# define BOOST_NO_SCOPED_ENUMS
+# define BOOST_NO_CXX11_SCOPED_ENUMS
#endif
// C++0x features in 4.6.n and later
//
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
-#define BOOST_NO_CONSTEXPR
-#define BOOST_NO_NOEXCEPT
-#define BOOST_NO_NULLPTR
-#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#define BOOST_NO_CXX11_CONSTEXPR
+#define BOOST_NO_CXX11_NOEXCEPT
+#define BOOST_NO_CXX11_NULLPTR
+#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#endif
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
-# define BOOST_NO_TEMPLATE_ALIASES
+# define BOOST_NO_CXX11_TEMPLATE_ALIASES
#endif
// C++0x features not supported at all yet
//
-#define BOOST_NO_DECLTYPE_N3276
+#define BOOST_NO_CXX11_DECLTYPE_N3276
#ifndef BOOST_COMPILER
# define BOOST_COMPILER "GNU C++ version " __VERSION__
diff --git a/include/boost/config/compiler/gcc_xml.hpp b/include/boost/config/compiler/gcc_xml.hpp
index 69905ae7..baa172f2 100644
--- a/include/boost/config/compiler/gcc_xml.hpp
+++ b/include/boost/config/compiler/gcc_xml.hpp
@@ -27,33 +27,32 @@
// C++0x features:
//
-# define BOOST_NO_CONSTEXPR
-# define BOOST_NO_NULLPTR
-# define BOOST_NO_TEMPLATE_ALIASES
-# define BOOST_NO_DECLTYPE
-# define BOOST_NO_DECLTYPE_N3276
-# define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-# define BOOST_NO_RVALUE_REFERENCES
-# define BOOST_NO_STATIC_ASSERT
-# define BOOST_NO_VARIADIC_TEMPLATES
-# define BOOST_NO_VARIADIC_MACROS
-# define BOOST_NO_AUTO_DECLARATIONS
-# define BOOST_NO_AUTO_MULTIDECLARATIONS
-# define BOOST_NO_CHAR16_T
-# define BOOST_NO_CHAR32_T
-# define BOOST_NO_DEFAULTED_FUNCTIONS
-# define BOOST_NO_DELETED_FUNCTIONS
+# define BOOST_NO_CXX11_CONSTEXPR
+# define BOOST_NO_CXX11_NULLPTR
+# define BOOST_NO_CXX11_TEMPLATE_ALIASES
+# define BOOST_NO_CXX11_DECLTYPE
+# define BOOST_NO_CXX11_DECLTYPE_N3276
+# define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
+# define BOOST_NO_CXX11_RVALUE_REFERENCES
+# define BOOST_NO_CXX11_STATIC_ASSERT
+# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+# define BOOST_NO_CXX11_VARIADIC_MACROS
+# define BOOST_NO_CXX11_AUTO_DECLARATIONS
+# define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+# define BOOST_NO_CXX11_CHAR16_T
+# define BOOST_NO_CXX11_CHAR32_T
+# define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+# define BOOST_NO_CXX11_DELETED_FUNCTIONS
# define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-# define BOOST_NO_SCOPED_ENUMS
+# define BOOST_NO_CXX11_SCOPED_ENUMS
# define BOOST_NO_SFINAE_EXPR
-# define BOOST_NO_SCOPED_ENUMS
-# define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-# define BOOST_NO_LAMBDAS
-# define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-# define BOOST_NO_RAW_LITERALS
-# define BOOST_NO_UNICODE_LITERALS
-# define BOOST_NO_NOEXCEPT
-#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+# define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+# define BOOST_NO_CXX11_LAMBDAS
+# define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+# define BOOST_NO_CXX11_RAW_LITERALS
+# define BOOST_NO_CXX11_UNICODE_LITERALS
+# define BOOST_NO_CXX11_NOEXCEPT
+#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#define BOOST_COMPILER "GCC-XML C++ version " __GCCXML__
diff --git a/include/boost/config/compiler/hp_acc.hpp b/include/boost/config/compiler/hp_acc.hpp
index d8cfb8cc..b41d1adc 100644
--- a/include/boost/config/compiler/hp_acc.hpp
+++ b/include/boost/config/compiler/hp_acc.hpp
@@ -92,31 +92,31 @@
//
#if !defined(__EDG__)
-#define BOOST_NO_AUTO_DECLARATIONS
-#define BOOST_NO_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CHAR16_T
-#define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONSTEXPR
-#define BOOST_NO_DECLTYPE
-#define BOOST_NO_DECLTYPE_N3276
-#define BOOST_NO_DEFAULTED_FUNCTIONS
-#define BOOST_NO_DELETED_FUNCTIONS
-#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_EXTERN_TEMPLATE
-#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#define BOOST_NO_CXX11_AUTO_DECLARATIONS
+#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CXX11_CHAR16_T
+#define BOOST_NO_CXX11_CHAR32_T
+#define BOOST_NO_CXX11_CONSTEXPR
+#define BOOST_NO_CXX11_DECLTYPE
+#define BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+#define BOOST_NO_CXX11_DELETED_FUNCTIONS
+#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+#define BOOST_NO_CXX11_EXTERN_TEMPLATE
+#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#define BOOST_NO_LAMBDAS
-#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#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_CXX11_LAMBDAS
+#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#define BOOST_NO_CXX11_NOEXCEPT
+#define BOOST_NO_CXX11_NULLPTR
+#define BOOST_NO_CXX11_RAW_LITERALS
+#define BOOST_NO_CXX11_RVALUE_REFERENCES
+#define BOOST_NO_CXX11_SCOPED_ENUMS
#define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_STATIC_ASSERT
-#define BOOST_NO_TEMPLATE_ALIASES
-#define BOOST_NO_UNICODE_LITERALS
-#define BOOST_NO_VARIADIC_TEMPLATES
+#define BOOST_NO_CXX11_STATIC_ASSERT
+#define BOOST_NO_CXX11_TEMPLATE_ALIASES
+#define BOOST_NO_CXX11_UNICODE_LITERALS
+#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
/*
See https://forums13.itrc.hp.com/service/forums/questionanswer.do?threadId=1443331 and
@@ -124,7 +124,7 @@
*/
#if (__HP_aCC < 62500) || !defined(HP_CXX0x_SOURCE)
- #define BOOST_NO_VARIADIC_MACROS
+ #define BOOST_NO_CXX11_VARIADIC_MACROS
#endif
#endif
diff --git a/include/boost/config/compiler/intel.hpp b/include/boost/config/compiler/intel.hpp
index 11909403..8c746c18 100644
--- a/include/boost/config/compiler/intel.hpp
+++ b/include/boost/config/compiler/intel.hpp
@@ -199,43 +199,43 @@ template<> struct assert_intrinsic_wchar_t {};
// - ICC added static_assert in 11.0 (first version with C++0x support)
//
#if defined(BOOST_INTEL_STDCXX0X)
-# undef BOOST_NO_STATIC_ASSERT
+# undef BOOST_NO_CXX11_STATIC_ASSERT
//
// These pass our test cases, but aren't officially supported according to:
// http://software.intel.com/en-us/articles/c0x-features-supported-by-intel-c-compiler/
//
-//# undef BOOST_NO_LAMBDAS
-//# undef BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-//# undef BOOST_NO_DECLTYPE
-//# undef BOOST_NO_AUTO_DECLARATIONS
-//# undef BOOST_NO_AUTO_MULTIDECLARATIONS
+//# undef BOOST_NO_CXX11_LAMBDAS
+//# undef BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+//# undef BOOST_NO_CXX11_DECLTYPE
+//# undef BOOST_NO_CXX11_AUTO_DECLARATIONS
+//# undef BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
#endif
#if defined(BOOST_INTEL_STDCXX0X) && (BOOST_INTEL_CXX_VERSION >= 1200)
-//# undef BOOST_NO_RVALUE_REFERENCES // Enabling this breaks Filesystem and Exception libraries
-//# undef BOOST_NO_SCOPED_ENUMS // doesn't really work!!
-# undef BOOST_NO_DELETED_FUNCTIONS
-# undef BOOST_NO_DEFAULTED_FUNCTIONS
-# undef BOOST_NO_LAMBDAS
-# undef BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-# undef BOOST_NO_DECLTYPE
-# undef BOOST_NO_AUTO_DECLARATIONS
-# undef BOOST_NO_AUTO_MULTIDECLARATIONS
+//# undef BOOST_NO_CXX11_RVALUE_REFERENCES // Enabling this breaks Filesystem and Exception libraries
+//# undef BOOST_NO_CXX11_SCOPED_ENUMS // doesn't really work!!
+# undef BOOST_NO_CXX11_DELETED_FUNCTIONS
+# undef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+# undef BOOST_NO_CXX11_LAMBDAS
+# undef BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+# undef BOOST_NO_CXX11_DECLTYPE
+# undef BOOST_NO_CXX11_AUTO_DECLARATIONS
+# undef BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
#endif
// icl Version 12.1.0.233 Build 20110811 and possibly some other builds
// had an incorrect __INTEL_COMPILER value of 9999. Intel say this has been fixed.
#if defined(BOOST_INTEL_STDCXX0X) && (BOOST_INTEL_CXX_VERSION > 1200)
-# undef BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-# undef BOOST_NO_NULLPTR
-# undef BOOST_NO_RVALUE_REFERENCES
+# undef BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
+# undef BOOST_NO_CXX11_NULLPTR
+# undef BOOST_NO_CXX11_RVALUE_REFERENCES
# undef BOOST_NO_SFINAE_EXPR
-# undef BOOST_NO_TEMPLATE_ALIASES
-# undef BOOST_NO_VARIADIC_TEMPLATES
+# undef BOOST_NO_CXX11_TEMPLATE_ALIASES
+# undef BOOST_NO_CXX11_VARIADIC_TEMPLATES
// http://software.intel.com/en-us/articles/c0x-features-supported-by-intel-c-compiler/
// continues to list scoped enum support as "Partial"
-//# undef BOOST_NO_SCOPED_ENUMS
+//# undef BOOST_NO_CXX11_SCOPED_ENUMS
#endif
#if defined(_MSC_VER) && (_MSC_VER <= 1700)
@@ -243,10 +243,10 @@ template<> struct assert_intrinsic_wchar_t {};
// Although the Intel compiler is capable of supporting these, it appears not to in MSVC compatibility mode:
//
# define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-# define BOOST_NO_VARIADIC_TEMPLATES
-# define BOOST_NO_DELETED_FUNCTIONS
-# define BOOST_NO_DEFAULTED_FUNCTIONS
-# define BOOST_NO_TEMPLATE_ALIASES
+# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+# define BOOST_NO_CXX11_DELETED_FUNCTIONS
+# define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+# define BOOST_NO_CXX11_TEMPLATE_ALIASES
#endif
#if (BOOST_INTEL_CXX_VERSION < 1200)
diff --git a/include/boost/config/compiler/metrowerks.hpp b/include/boost/config/compiler/metrowerks.hpp
index 4a1edd47..32aa0dab 100644
--- a/include/boost/config/compiler/metrowerks.hpp
+++ b/include/boost/config/compiler/metrowerks.hpp
@@ -90,34 +90,34 @@
#if __MWERKS__ > 0x3206 && __option(rvalue_refs)
# define BOOST_HAS_RVALUE_REFS
#else
-# define BOOST_NO_RVALUE_REFERENCES
+# define BOOST_NO_CXX11_RVALUE_REFERENCES
#endif
-#define BOOST_NO_AUTO_DECLARATIONS
-#define BOOST_NO_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CHAR16_T
-#define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONSTEXPR
-#define BOOST_NO_DECLTYPE
-#define BOOST_NO_DECLTYPE_N3276
-#define BOOST_NO_DEFAULTED_FUNCTIONS
-#define BOOST_NO_DELETED_FUNCTIONS
-#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_EXTERN_TEMPLATE
-#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#define BOOST_NO_CXX11_AUTO_DECLARATIONS
+#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CXX11_CHAR16_T
+#define BOOST_NO_CXX11_CHAR32_T
+#define BOOST_NO_CXX11_CONSTEXPR
+#define BOOST_NO_CXX11_DECLTYPE
+#define BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+#define BOOST_NO_CXX11_DELETED_FUNCTIONS
+#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+#define BOOST_NO_CXX11_EXTERN_TEMPLATE
+#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#define BOOST_NO_LAMBDAS
-#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_NOEXCEPT
-#define BOOST_NO_NULLPTR
-#define BOOST_NO_RAW_LITERALS
-#define BOOST_NO_SCOPED_ENUMS
+#define BOOST_NO_CXX11_LAMBDAS
+#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#define BOOST_NO_CXX11_NOEXCEPT
+#define BOOST_NO_CXX11_NULLPTR
+#define BOOST_NO_CXX11_RAW_LITERALS
+#define BOOST_NO_CXX11_SCOPED_ENUMS
#define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_STATIC_ASSERT
-#define BOOST_NO_TEMPLATE_ALIASES
-#define BOOST_NO_UNICODE_LITERALS
-#define BOOST_NO_VARIADIC_TEMPLATES
-#define BOOST_NO_VARIADIC_MACROS
-#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#define BOOST_NO_CXX11_STATIC_ASSERT
+#define BOOST_NO_CXX11_TEMPLATE_ALIASES
+#define BOOST_NO_CXX11_UNICODE_LITERALS
+#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+#define BOOST_NO_CXX11_VARIADIC_MACROS
+#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#define BOOST_COMPILER "Metrowerks CodeWarrior C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
diff --git a/include/boost/config/compiler/mpw.hpp b/include/boost/config/compiler/mpw.hpp
index f328b3bb..c6c95358 100644
--- a/include/boost/config/compiler/mpw.hpp
+++ b/include/boost/config/compiler/mpw.hpp
@@ -40,33 +40,33 @@
//
// See boost\config\suffix.hpp for BOOST_NO_LONG_LONG
//
-#define BOOST_NO_AUTO_DECLARATIONS
-#define BOOST_NO_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CHAR16_T
-#define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONSTEXPR
-#define BOOST_NO_DECLTYPE
-#define BOOST_NO_DECLTYPE_N3276
-#define BOOST_NO_DEFAULTED_FUNCTIONS
-#define BOOST_NO_DELETED_FUNCTIONS
-#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_EXTERN_TEMPLATE
-#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#define BOOST_NO_CXX11_AUTO_DECLARATIONS
+#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CXX11_CHAR16_T
+#define BOOST_NO_CXX11_CHAR32_T
+#define BOOST_NO_CXX11_CONSTEXPR
+#define BOOST_NO_CXX11_DECLTYPE
+#define BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+#define BOOST_NO_CXX11_DELETED_FUNCTIONS
+#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+#define BOOST_NO_CXX11_EXTERN_TEMPLATE
+#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#define BOOST_NO_LAMBDAS
-#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#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_CXX11_LAMBDAS
+#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#define BOOST_NO_CXX11_NOEXCEPT
+#define BOOST_NO_CXX11_NULLPTR
+#define BOOST_NO_CXX11_RAW_LITERALS
+#define BOOST_NO_CXX11_RVALUE_REFERENCES
+#define BOOST_NO_CXX11_SCOPED_ENUMS
#define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_STATIC_ASSERT
-#define BOOST_NO_TEMPLATE_ALIASES
-#define BOOST_NO_UNICODE_LITERALS
-#define BOOST_NO_VARIADIC_TEMPLATES
-#define BOOST_NO_VARIADIC_MACROS
-#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#define BOOST_NO_CXX11_STATIC_ASSERT
+#define BOOST_NO_CXX11_TEMPLATE_ALIASES
+#define BOOST_NO_CXX11_UNICODE_LITERALS
+#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+#define BOOST_NO_CXX11_VARIADIC_MACROS
+#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
//
// versions check:
diff --git a/include/boost/config/compiler/pathscale.hpp b/include/boost/config/compiler/pathscale.hpp
index f5fe6e83..96763489 100644
--- a/include/boost/config/compiler/pathscale.hpp
+++ b/include/boost/config/compiler/pathscale.hpp
@@ -32,34 +32,33 @@
# define BOOST_HAS_EXPM1
# define BOOST_HAS_DIRENT_H
# define BOOST_HAS_CLOCK_GETTIME
-# define BOOST_NO_VARIADIC_TEMPLATES
-# define BOOST_NO_UNICODE_LITERALS
-# define BOOST_NO_TEMPLATE_ALIASES
-# define BOOST_NO_STD_UNORDERED
-# define BOOST_NO_STATIC_ASSERT
+# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+# define BOOST_NO_CXX11_UNICODE_LITERALS
+# define BOOST_NO_CXX11_TEMPLATE_ALIASES
+# define BOOST_NO_CXX11_STATIC_ASSERT
# define BOOST_NO_SFINAE_EXPR
-# define BOOST_NO_SCOPED_ENUMS
-# define BOOST_NO_RVALUE_REFERENCES
-# define BOOST_NO_RAW_LITERALS
-# define BOOST_NO_NULLPTR
+# define BOOST_NO_CXX11_SCOPED_ENUMS
+# define BOOST_NO_CXX11_RVALUE_REFERENCES
+# define BOOST_NO_CXX11_RAW_LITERALS
+# define BOOST_NO_CXX11_NULLPTR
# define BOOST_NO_NUMERIC_LIMITS_LOWEST
-# define BOOST_NO_NOEXCEPT
-# define BOOST_NO_LAMBDAS
-# define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
+# define BOOST_NO_CXX11_NOEXCEPT
+# define BOOST_NO_CXX11_LAMBDAS
+# define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
# define BOOST_NO_MS_INT64_NUMERIC_LIMITS
-# define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-# define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-# define BOOST_NO_DELETED_FUNCTIONS
-# define BOOST_NO_DEFAULTED_FUNCTIONS
-# define BOOST_NO_DECLTYPE
-# define BOOST_NO_DECLTYPE_N3276
-# define BOOST_NO_CONSTEXPR
+# define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
+# define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+# define BOOST_NO_CXX11_DELETED_FUNCTIONS
+# define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+# define BOOST_NO_CXX11_DECLTYPE
+# define BOOST_NO_CXX11_DECLTYPE_N3276
+# define BOOST_NO_CXX11_CONSTEXPR
# define BOOST_NO_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_CXX11_CHAR32_T
+# define BOOST_NO_CXX11_CHAR16_T
+# define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+# define BOOST_NO_CXX11_AUTO_DECLARATIONS
+# define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
# define BOOST_NO_CXX11_HDR_UNORDERED_SET
# define BOOST_NO_CXX11_HDR_UNORDERED_MAP
# define BOOST_NO_CXX11_HDR_TYPEINDEX
diff --git a/include/boost/config/compiler/pgi.hpp b/include/boost/config/compiler/pgi.hpp
index e818e6cb..170e0da0 100644
--- a/include/boost/config/compiler/pgi.hpp
+++ b/include/boost/config/compiler/pgi.hpp
@@ -32,9 +32,8 @@
#define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
#define BOOST_NO_TWO_PHASE_NAME_LOOKUP
-#define BOOST_NO_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_AUTO_DECLARATIONS
-#define BOOST_NO_STD_UNORDERED
+#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CXX11_AUTO_DECLARATIONS
#elif __PGIC__ >= 10
@@ -53,8 +52,8 @@
#define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
#define BOOST_NO_TWO_PHASE_NAME_LOOKUP
#define BOOST_NO_SWPRINTF
-#define BOOST_NO_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_AUTO_DECLARATIONS
+#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CXX11_AUTO_DECLARATIONS
#else
@@ -66,32 +65,32 @@
//
// See boost\config\suffix.hpp for BOOST_NO_LONG_LONG
//
-#define BOOST_NO_CHAR16_T
-#define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONSTEXPR
-#define BOOST_NO_DECLTYPE
-#define BOOST_NO_DECLTYPE_N3276
-#define BOOST_NO_DEFAULTED_FUNCTIONS
-#define BOOST_NO_DELETED_FUNCTIONS
-#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_EXTERN_TEMPLATE
-#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#define BOOST_NO_LAMBDAS
-#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_NOEXCEPT
-#define BOOST_NO_NULLPTR
+#define BOOST_NO_CXX11_CHAR16_T
+#define BOOST_NO_CXX11_CHAR32_T
+#define BOOST_NO_CXX11_CONSTEXPR
+#define BOOST_NO_CXX11_DECLTYPE
+#define BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+#define BOOST_NO_CXX11_DELETED_FUNCTIONS
+#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+#define BOOST_NO_CXX11_EXTERN_TEMPLATE
+#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#define BOOST_NO_CXX11_LAMBDAS
+#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#define BOOST_NO_CXX11_NOEXCEPT
+#define BOOST_NO_CXX11_NULLPTR
#define BOOST_NO_NUMERIC_LIMITS_LOWEST
-#define BOOST_NO_RAW_LITERALS
-#define BOOST_NO_RVALUE_REFERENCES
-#define BOOST_NO_SCOPED_ENUMS
+#define BOOST_NO_CXX11_RAW_LITERALS
+#define BOOST_NO_CXX11_RVALUE_REFERENCES
+#define BOOST_NO_CXX11_SCOPED_ENUMS
#define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_STATIC_ASSERT
+#define BOOST_NO_CXX11_STATIC_ASSERT
#define BOOST_NO_SWPRINTF
-#define BOOST_NO_TEMPLATE_ALIASES
-#define BOOST_NO_UNICODE_LITERALS
-#define BOOST_NO_VARIADIC_TEMPLATES
-#define BOOST_NO_VARIADIC_MACROS
-#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#define BOOST_NO_CXX11_TEMPLATE_ALIASES
+#define BOOST_NO_CXX11_UNICODE_LITERALS
+#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+#define BOOST_NO_CXX11_VARIADIC_MACROS
+#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#define BOOST_NO_CXX11_HDR_UNORDERED_SET
#define BOOST_NO_CXX11_HDR_UNORDERED_MAP
diff --git a/include/boost/config/compiler/sunpro_cc.hpp b/include/boost/config/compiler/sunpro_cc.hpp
index 7d298e6c..16686152 100644
--- a/include/boost/config/compiler/sunpro_cc.hpp
+++ b/include/boost/config/compiler/sunpro_cc.hpp
@@ -99,33 +99,33 @@
//
# define BOOST_HAS_LONG_LONG
-#define BOOST_NO_AUTO_DECLARATIONS
-#define BOOST_NO_AUTO_MULTIDECLARATIONS
-#define BOOST_NO_CHAR16_T
-#define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONSTEXPR
-#define BOOST_NO_DECLTYPE
-#define BOOST_NO_DECLTYPE_N3276
-#define BOOST_NO_DEFAULTED_FUNCTIONS
-#define BOOST_NO_DELETED_FUNCTIONS
-#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_EXTERN_TEMPLATE
-#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#define BOOST_NO_CXX11_AUTO_DECLARATIONS
+#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_CXX11_CHAR16_T
+#define BOOST_NO_CXX11_CHAR32_T
+#define BOOST_NO_CXX11_CONSTEXPR
+#define BOOST_NO_CXX11_DECLTYPE
+#define BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+#define BOOST_NO_CXX11_DELETED_FUNCTIONS
+#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+#define BOOST_NO_CXX11_EXTERN_TEMPLATE
+#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#define BOOST_NO_LAMBDAS
-#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#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_CXX11_LAMBDAS
+#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#define BOOST_NO_CXX11_NOEXCEPT
+#define BOOST_NO_CXX11_NULLPTR
+#define BOOST_NO_CXX11_RAW_LITERALS
+#define BOOST_NO_CXX11_RVALUE_REFERENCES
+#define BOOST_NO_CXX11_SCOPED_ENUMS
#define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_STATIC_ASSERT
-#define BOOST_NO_TEMPLATE_ALIASES
-#define BOOST_NO_UNICODE_LITERALS
-#define BOOST_NO_VARIADIC_TEMPLATES
-#define BOOST_NO_VARIADIC_MACROS
-#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#define BOOST_NO_CXX11_STATIC_ASSERT
+#define BOOST_NO_CXX11_TEMPLATE_ALIASES
+#define BOOST_NO_CXX11_UNICODE_LITERALS
+#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+#define BOOST_NO_CXX11_VARIADIC_MACROS
+#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
//
// Version
diff --git a/include/boost/config/compiler/vacpp.hpp b/include/boost/config/compiler/vacpp.hpp
index 3614bd04..35d5612f 100644
--- a/include/boost/config/compiler/vacpp.hpp
+++ b/include/boost/config/compiler/vacpp.hpp
@@ -71,58 +71,58 @@
// See boost\config\suffix.hpp for BOOST_NO_LONG_LONG
//
#if ! __IBMCPP_AUTO_TYPEDEDUCTION
-# define BOOST_NO_AUTO_DECLARATIONS
-# define BOOST_NO_AUTO_MULTIDECLARATIONS
+# define BOOST_NO_CXX11_AUTO_DECLARATIONS
+# define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
#endif
#if ! __IBMCPP_UTF_LITERAL__
-# define BOOST_NO_CHAR16_T
-# define BOOST_NO_CHAR32_T
+# define BOOST_NO_CXX11_CHAR16_T
+# define BOOST_NO_CXX11_CHAR32_T
#endif
#if ! __IBMCPP_CONSTEXPR
-# define BOOST_NO_CONSTEXPR
+# define BOOST_NO_CXX11_CONSTEXPR
#endif
#if ! __IBMCPP_DECLTYPE
-# define BOOST_NO_DECLTYPE
+# define BOOST_NO_CXX11_DECLTYPE
#else
# define BOOST_HAS_DECLTYPE
#endif
-#define BOOST_NO_DECLTYPE_N3276
-#define BOOST_NO_DEFAULTED_FUNCTIONS
-#define BOOST_NO_DELETED_FUNCTIONS
+#define BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+#define BOOST_NO_CXX11_DELETED_FUNCTIONS
#if ! __IBMCPP_EXPLICIT_CONVERSION_OPERATORS
-# define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+# define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
#endif
#if ! __IBMCPP_EXTERN_TEMPLATE
-# define BOOST_NO_EXTERN_TEMPLATE
+# define BOOST_NO_CXX11_EXTERN_TEMPLATE
#endif
#if ! __IBMCPP_VARIADIC_TEMPLATES
// not enabled separately at this time
-# define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+# define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
#endif
#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#define BOOST_NO_LAMBDAS
-#define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
-#define BOOST_NO_NOEXCEPT
-#define BOOST_NO_NULLPTR
-#define BOOST_NO_RAW_LITERALS
+#define BOOST_NO_CXX11_LAMBDAS
+#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#define BOOST_NO_CXX11_NOEXCEPT
+#define BOOST_NO_CXX11_NULLPTR
+#define BOOST_NO_CXX11_RAW_LITERALS
#if ! __IBMCPP_RVALUE_REFERENCES
-# define BOOST_NO_RVALUE_REFERENCES
+# define BOOST_NO_CXX11_RVALUE_REFERENCES
#endif
#if ! __IBMCPP_SCOPED_ENUM
-# define BOOST_NO_SCOPED_ENUMS
+# define BOOST_NO_CXX11_SCOPED_ENUMS
#endif
#define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#if ! __IBMCPP_STATIC_ASSERT
-# define BOOST_NO_STATIC_ASSERT
+# define BOOST_NO_CXX11_STATIC_ASSERT
#endif
-#define BOOST_NO_TEMPLATE_ALIASES
-#define BOOST_NO_UNICODE_LITERALS
+#define BOOST_NO_CXX11_TEMPLATE_ALIASES
+#define BOOST_NO_CXX11_UNICODE_LITERALS
#if ! __IBMCPP_VARIADIC_TEMPLATES
-# define BOOST_NO_VARIADIC_TEMPLATES
+# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
#endif
#if ! __C99_MACRO_WITH_VA_ARGS
-# define BOOST_NO_VARIADIC_MACROS
+# define BOOST_NO_CXX11_VARIADIC_MACROS
#endif
diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp
index e80deb14..0df43b79 100644
--- a/include/boost/config/compiler/visualc.hpp
+++ b/include/boost/config/compiler/visualc.hpp
@@ -99,9 +99,9 @@
// it appears not to actually work:
# define BOOST_NO_SWPRINTF
// Our extern template tests also fail for this compiler:
-# define BOOST_NO_EXTERN_TEMPLATE
+# define BOOST_NO_CXX11_EXTERN_TEMPLATE
// Variadic macros do not exist for VC7.1 and lower
-# define BOOST_NO_VARIADIC_MACROS
+# define BOOST_NO_CXX11_VARIADIC_MACROS
#endif
#if defined(UNDER_CE)
@@ -191,13 +191,13 @@
// C++ features supported by VC++ 10 (aka 2010)
//
#if _MSC_VER < 1600
-# define BOOST_NO_AUTO_DECLARATIONS
-# define BOOST_NO_AUTO_MULTIDECLARATIONS
-# define BOOST_NO_LAMBDAS
-# define BOOST_NO_RVALUE_REFERENCES
-# define BOOST_NO_STATIC_ASSERT
-# define BOOST_NO_NULLPTR
-# define BOOST_NO_DECLTYPE
+# define BOOST_NO_CXX11_AUTO_DECLARATIONS
+# define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+# define BOOST_NO_CXX11_LAMBDAS
+# define BOOST_NO_CXX11_RVALUE_REFERENCES
+# define BOOST_NO_CXX11_STATIC_ASSERT
+# define BOOST_NO_CXX11_NULLPTR
+# define BOOST_NO_CXX11_DECLTYPE
#endif // _MSC_VER < 1600
#if _MSC_VER >= 1600
@@ -205,24 +205,24 @@
#endif
// C++0x features not supported by any versions
-#define BOOST_NO_CHAR16_T
-#define BOOST_NO_CHAR32_T
-#define BOOST_NO_CONSTEXPR
-#define BOOST_NO_DECLTYPE_N3276
-#define BOOST_NO_DEFAULTED_FUNCTIONS
-#define BOOST_NO_DELETED_FUNCTIONS
-#define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
-#define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#define BOOST_NO_CXX11_CHAR16_T
+#define BOOST_NO_CXX11_CHAR32_T
+#define BOOST_NO_CXX11_CONSTEXPR
+#define BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+#define BOOST_NO_CXX11_DELETED_FUNCTIONS
+#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-#define BOOST_NO_NOEXCEPT
-#define BOOST_NO_RAW_LITERALS
-#define BOOST_NO_SCOPED_ENUMS
-#define BOOST_NO_TEMPLATE_ALIASES
-#define BOOST_NO_UNICODE_LITERALS
-#define BOOST_NO_VARIADIC_TEMPLATES
+#define BOOST_NO_CXX11_NOEXCEPT
+#define BOOST_NO_CXX11_RAW_LITERALS
+#define BOOST_NO_CXX11_SCOPED_ENUMS
+#define BOOST_NO_CXX11_TEMPLATE_ALIASES
+#define BOOST_NO_CXX11_UNICODE_LITERALS
+#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
#define BOOST_NO_SFINAE_EXPR
#define BOOST_NO_TWO_PHASE_NAME_LOOKUP
-#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
//
// prefix and suffix headers:
//
diff --git a/include/boost/config/stdlib/dinkumware.hpp b/include/boost/config/stdlib/dinkumware.hpp
index 1b89d28b..ce3c5012 100644
--- a/include/boost/config/stdlib/dinkumware.hpp
+++ b/include/boost/config/stdlib/dinkumware.hpp
@@ -101,7 +101,6 @@
# define BOOST_NO_CXX11_HDR_RANDOM
# define BOOST_NO_CXX11_HDR_REGEX
# define BOOST_NO_CXX11_HDR_SYSTEM_ERROR
-# define BOOST_NO_STD_UNORDERED // deprecated; see following
# define BOOST_NO_CXX11_HDR_UNORDERED_MAP
# define BOOST_NO_CXX11_HDR_UNORDERED_SET
# define BOOST_NO_CXX11_HDR_TUPLE
diff --git a/include/boost/config/stdlib/libcomo.hpp b/include/boost/config/stdlib/libcomo.hpp
index c92635a7..db56e022 100644
--- a/include/boost/config/stdlib/libcomo.hpp
+++ b/include/boost/config/stdlib/libcomo.hpp
@@ -51,7 +51,6 @@
# define BOOST_NO_CXX11_HDR_TUPLE
# define BOOST_NO_CXX11_HDR_TYPE_TRAITS
# define BOOST_NO_CXX11_HDR_TYPEINDEX
-# define BOOST_NO_STD_UNORDERED // deprecated; see following
# define BOOST_NO_CXX11_HDR_UNORDERED_MAP
# define BOOST_NO_CXX11_HDR_UNORDERED_SET
# define BOOST_NO_NUMERIC_LIMITS_LOWEST
diff --git a/include/boost/config/stdlib/libstdcpp3.hpp b/include/boost/config/stdlib/libstdcpp3.hpp
index 283d68e9..1bf62ec2 100644
--- a/include/boost/config/stdlib/libstdcpp3.hpp
+++ b/include/boost/config/stdlib/libstdcpp3.hpp
@@ -108,7 +108,6 @@
# define BOOST_NO_CXX11_HDR_ARRAY
# define BOOST_NO_CXX11_HDR_REGEX
# define BOOST_NO_CXX11_HDR_TUPLE
-# define BOOST_NO_STD_UNORDERED // deprecated; see following
# define BOOST_NO_CXX11_HDR_UNORDERED_MAP
# define BOOST_NO_CXX11_HDR_UNORDERED_SET
# define BOOST_NO_CXX11_HDR_FUNCTIONAL
diff --git a/include/boost/config/stdlib/modena.hpp b/include/boost/config/stdlib/modena.hpp
index a4c7b76c..d46531c3 100644
--- a/include/boost/config/stdlib/modena.hpp
+++ b/include/boost/config/stdlib/modena.hpp
@@ -40,7 +40,6 @@
# define BOOST_NO_CXX11_HDR_TUPLE
# define BOOST_NO_CXX11_HDR_TYPE_TRAITS
# define BOOST_NO_CXX11_HDR_TYPEINDEX
-# define BOOST_NO_STD_UNORDERED // deprecated; see following
# define BOOST_NO_CXX11_HDR_UNORDERED_MAP
# define BOOST_NO_CXX11_HDR_UNORDERED_SET
# define BOOST_NO_NUMERIC_LIMITS_LOWEST
diff --git a/include/boost/config/stdlib/msl.hpp b/include/boost/config/stdlib/msl.hpp
index 44151162..8e92f452 100644
--- a/include/boost/config/stdlib/msl.hpp
+++ b/include/boost/config/stdlib/msl.hpp
@@ -64,7 +64,6 @@
# define BOOST_NO_CXX11_HDR_TUPLE
# define BOOST_NO_CXX11_HDR_TYPE_TRAITS
# define BOOST_NO_CXX11_HDR_TYPEINDEX
-# define BOOST_NO_STD_UNORDERED // deprecated; see following
# define BOOST_NO_CXX11_HDR_UNORDERED_MAP
# define BOOST_NO_CXX11_HDR_UNORDERED_SET
# define BOOST_NO_NUMERIC_LIMITS_LOWEST
diff --git a/include/boost/config/stdlib/roguewave.hpp b/include/boost/config/stdlib/roguewave.hpp
index 5273c72b..57415a25 100644
--- a/include/boost/config/stdlib/roguewave.hpp
+++ b/include/boost/config/stdlib/roguewave.hpp
@@ -176,7 +176,6 @@
# define BOOST_NO_CXX11_HDR_THREAD
# define BOOST_NO_CXX11_HDR_TUPLE
# define BOOST_NO_CXX11_HDR_TYPEINDEX
-# define BOOST_NO_STD_UNORDERED // deprecated; see following
# define BOOST_NO_CXX11_HDR_UNORDERED_MAP
# define BOOST_NO_CXX11_HDR_UNORDERED_SET
# define BOOST_NO_NUMERIC_LIMITS_LOWEST
diff --git a/include/boost/config/stdlib/sgi.hpp b/include/boost/config/stdlib/sgi.hpp
index 10b4ee22..f7c1a436 100644
--- a/include/boost/config/stdlib/sgi.hpp
+++ b/include/boost/config/stdlib/sgi.hpp
@@ -134,7 +134,6 @@
# define BOOST_NO_CXX11_HDR_TUPLE
# define BOOST_NO_CXX11_HDR_TYPE_TRAITS
# define BOOST_NO_CXX11_HDR_TYPEINDEX
-# define BOOST_NO_STD_UNORDERED // deprecated; see following
# define BOOST_NO_CXX11_HDR_UNORDERED_MAP
# define BOOST_NO_CXX11_HDR_UNORDERED_SET
# define BOOST_NO_NUMERIC_LIMITS_LOWEST
diff --git a/include/boost/config/stdlib/stlport.hpp b/include/boost/config/stdlib/stlport.hpp
index f2a3a9a0..36d2a515 100644
--- a/include/boost/config/stdlib/stlport.hpp
+++ b/include/boost/config/stdlib/stlport.hpp
@@ -71,10 +71,6 @@
# endif
#endif
-#if defined(_STLPORT_VERSION) && ((_STLPORT_VERSION < 0x500) || (_STLPORT_VERSION >= 0x520))
-# define BOOST_NO_STD_UNORDERED
-#endif
-
#if defined(_STLPORT_VERSION) && (_STLPORT_VERSION >= 0x520)
# define BOOST_HAS_TR1_UNORDERED_SET
# define BOOST_HAS_TR1_UNORDERED_MAP
@@ -228,7 +224,6 @@ namespace boost { using std::min; using std::max; }
# define BOOST_NO_CXX11_HDR_TUPLE
# define BOOST_NO_CXX11_HDR_TYPE_TRAITS
# define BOOST_NO_CXX11_HDR_TYPEINDEX
-# define BOOST_NO_STD_UNORDERED // deprecated; see following
# define BOOST_NO_CXX11_HDR_UNORDERED_MAP
# define BOOST_NO_CXX11_HDR_UNORDERED_SET
# define BOOST_NO_NUMERIC_LIMITS_LOWEST
diff --git a/include/boost/config/stdlib/vacpp.hpp b/include/boost/config/stdlib/vacpp.hpp
index 2c609d6e..aed701ea 100644
--- a/include/boost/config/stdlib/vacpp.hpp
+++ b/include/boost/config/stdlib/vacpp.hpp
@@ -40,7 +40,6 @@
# define BOOST_NO_CXX11_HDR_TUPLE
# define BOOST_NO_CXX11_HDR_TYPE_TRAITS
# define BOOST_NO_CXX11_HDR_TYPEINDEX
-# define BOOST_NO_STD_UNORDERED // deprecated; see following
# define BOOST_NO_CXX11_HDR_UNORDERED_MAP
# define BOOST_NO_CXX11_HDR_UNORDERED_SET
# define BOOST_NO_NUMERIC_LIMITS_LOWEST
diff --git a/include/boost/config/suffix.hpp b/include/boost/config/suffix.hpp
index 502eb4fa..b0e96617 100644
--- a/include/boost/config/suffix.hpp
+++ b/include/boost/config/suffix.hpp
@@ -103,13 +103,6 @@
# define BOOST_NO_LONG_LONG_NUMERIC_LIMITS
#endif
-//
-// Normalize BOOST_NO_STATIC_ASSERT and (depricated) BOOST_HAS_STATIC_ASSERT:
-//
-#if !defined(BOOST_NO_STATIC_ASSERT) && !defined(BOOST_HAS_STATIC_ASSERT)
-# define BOOST_HAS_STATIC_ASSERT
-#endif
-
//
// if there is no __int64 then there is no specialisation
// for numeric_limits<__int64> either:
@@ -334,27 +327,6 @@
# define BOOST_HASH_MAP_HEADER
#endif
-//
-// Set BOOST_HAS_RVALUE_REFS when BOOST_NO_RVALUE_REFERENCES is not defined
-//
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_HAS_RVALUE_REFS)
-#define BOOST_HAS_RVALUE_REFS
-#endif
-
-//
-// Set BOOST_HAS_VARIADIC_TMPL when BOOST_NO_VARIADIC_TEMPLATES is not defined
-//
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_HAS_VARIADIC_TMPL)
-#define BOOST_HAS_VARIADIC_TMPL
-#endif
-
-//
-// Set BOOST_NO_DECLTYPE_N3276 when BOOST_NO_DECLTYPE is defined
-//
-#if !defined(BOOST_NO_DECLTYPE_N3276) && defined(BOOST_NO_DECLTYPE)
-#define BOOST_NO_DECLTYPE_N3276
-#endif
-
// BOOST_HAS_ABI_HEADERS
// This macro gets set if we have headers that fix the ABI,
// and prevent ODR violations when linking to external libraries:
@@ -624,20 +596,6 @@ namespace std{ using ::type_info; }
#define BOOST_DO_JOIN( X, Y ) BOOST_DO_JOIN2(X,Y)
#define BOOST_DO_JOIN2( X, Y ) X##Y
-//
-// Helper macros BOOST_NOEXCEPT, BOOST_NOEXCEPT_IF, BOOST_NOEXCEPT_EXPR
-// These aid the transition to C++11 while still supporting C++03 compilers
-//
-#ifdef BOOST_NO_NOEXCEPT
-# define BOOST_NOEXCEPT
-# define BOOST_NOEXCEPT_IF(Predicate)
-# define BOOST_NOEXCEPT_EXPR(Expression) false
-#else
-# define BOOST_NOEXCEPT noexcept
-# define BOOST_NOEXCEPT_IF(Predicate) noexcept((Predicate))
-# define BOOST_NOEXCEPT_EXPR(Expression) noexcept((Expression))
-#endif
-
//
// Set some default values for compiler/library/platform names.
// These are for debugging config setup only:
@@ -664,19 +622,6 @@ namespace std{ using ::type_info; }
# define BOOST_GPU_ENABLED
# endif
-//
-// constexpr workarounds
-//
-#if defined(BOOST_NO_CONSTEXPR)
-#define BOOST_CONSTEXPR
-#define BOOST_CONSTEXPR_OR_CONST const
-#else
-#define BOOST_CONSTEXPR constexpr
-#define BOOST_CONSTEXPR_OR_CONST constexpr
-#endif
-
-#define BOOST_STATIC_CONSTEXPR static BOOST_CONSTEXPR_OR_CONST
-
// BOOST_FORCEINLINE ---------------------------------------------//
// Macro to use in place of 'inline' to force a function to be inline
#if !defined(BOOST_FORCEINLINE)
@@ -693,6 +638,14 @@ namespace std{ using ::type_info; }
// -------------------- Deprecated macros for 1.50 ---------------------------
// These will go away in a future release
+// Use BOOST_NO_CXX11_HDR_UNORDERED_SET or BOOST_NO_CXX11_HDR_UNORDERED_MAP
+// instead of BOOST_NO_STD_UNORDERED
+#if defined(BOOST_NO_CXX11_HDR_UNORDERED_MAP) || defined (BOOST_NO_CXX11_HDR_UNORDERED_SET)
+# ifndef BOOST_NO_STD_UNORDERED
+# define BOOST_NO_STD_UNORDERED
+# endif
+#endif
+
// Use BOOST_NO_CXX11_HDR_INITIALIZER_LIST instead of BOOST_NO_INITIALIZER_LISTS
#if defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) && !defined(BOOST_NO_INITIALIZER_LISTS)
# define BOOST_NO_INITIALIZER_LISTS
@@ -781,5 +734,172 @@ namespace std{ using ::type_info; }
// ------------------ End of deprecated macros for 1.50 ---------------------------
+// -------------------- Deprecated macros for 1.51 ---------------------------
+// These will go away in a future release
+
+// Use BOOST_NO_CXX11_AUTO_DECLARATIONS instead of BOOST_NO_AUTO_DECLARATIONS
+#if defined(BOOST_NO_CXX11_AUTO_DECLARATIONS) && !defined(BOOST_NO_AUTO_DECLARATIONS)
+# define BOOST_NO_AUTO_DECLARATIONS
+#endif
+// Use BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS instead of BOOST_NO_AUTO_MULTIDECLARATIONS
+#if defined(BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS) && !defined(BOOST_NO_AUTO_MULTIDECLARATIONS)
+# define BOOST_NO_AUTO_MULTIDECLARATIONS
+#endif
+// Use BOOST_NO_CXX11_CHAR16_T instead of BOOST_NO_CHAR16_T
+#if defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CHAR16_T)
+# define BOOST_NO_CHAR16_T
+#endif
+// Use BOOST_NO_CXX11_CHAR32_T instead of BOOST_NO_CHAR32_T
+#if defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CHAR32_T)
+# define BOOST_NO_CHAR32_T
+#endif
+// Use BOOST_NO_CXX11_TEMPLATE_ALIASES instead of BOOST_NO_TEMPLATE_ALIASES
+#if defined(BOOST_NO_CXX11_TEMPLATE_ALIASES) && !defined(BOOST_NO_TEMPLATE_ALIASES)
+# define BOOST_NO_TEMPLATE_ALIASES
+#endif
+// Use BOOST_NO_CXX11_CONSTEXPR instead of BOOST_NO_CONSTEXPR
+#if defined(BOOST_NO_CXX11_CONSTEXPR) && !defined(BOOST_NO_CONSTEXPR)
+# define BOOST_NO_CONSTEXPR
+#endif
+// Use BOOST_NO_CXX11_DECLTYPE_N3276 instead of BOOST_NO_DECLTYPE_N3276
+#if defined(BOOST_NO_CXX11_DECLTYPE_N3276) && !defined(BOOST_NO_DECLTYPE_N3276)
+# define BOOST_NO_DECLTYPE_N3276
+#endif
+// Use BOOST_NO_CXX11_DECLTYPE instead of BOOST_NO_DECLTYPE
+#if defined(BOOST_NO_CXX11_DECLTYPE) && !defined(BOOST_NO_DECLTYPE)
+# define BOOST_NO_DECLTYPE
+#endif
+// Use BOOST_NO_CXX11_DEFAULTED_FUNCTIONS instead of BOOST_NO_DEFAULTED_FUNCTIONS
+#if defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && !defined(BOOST_NO_DEFAULTED_FUNCTIONS)
+# define BOOST_NO_DEFAULTED_FUNCTIONS
+#endif
+// Use BOOST_NO_CXX11_DELETED_FUNCTIONS instead of BOOST_NO_DELETED_FUNCTIONS
+#if defined(BOOST_NO_CXX11_DELETED_FUNCTIONS) && !defined(BOOST_NO_DELETED_FUNCTIONS)
+# define BOOST_NO_DELETED_FUNCTIONS
+#endif
+// Use BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS instead of BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#if defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS) && !defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS)
+# define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#endif
+// Use BOOST_NO_CXX11_EXTERN_TEMPLATE instead of BOOST_NO_EXTERN_TEMPLATE
+#if defined(BOOST_NO_CXX11_EXTERN_TEMPLATE) && !defined(BOOST_NO_EXTERN_TEMPLATE)
+# define BOOST_NO_EXTERN_TEMPLATE
+#endif
+// Use BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS instead of BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#if defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS) && !defined(BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS)
+# define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#endif
+// Use BOOST_NO_CXX11_LAMBDAS instead of BOOST_NO_LAMBDAS
+#if defined(BOOST_NO_CXX11_LAMBDAS) && !defined(BOOST_NO_LAMBDAS)
+# define BOOST_NO_LAMBDAS
+#endif
+// Use BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS instead of BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#if defined(BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS) && !defined(BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS)
+# define BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#endif
+// Use BOOST_NO_CXX11_NOEXCEPT instead of BOOST_NO_NOEXCEPT
+#if defined(BOOST_NO_CXX11_NOEXCEPT) && !defined(BOOST_NO_NOEXCEPT)
+# define BOOST_NO_NOEXCEPT
+#endif
+// Use BOOST_NO_CXX11_NULLPTR instead of BOOST_NO_NULLPTR
+#if defined(BOOST_NO_CXX11_NULLPTR) && !defined(BOOST_NO_NULLPTR)
+# define BOOST_NO_NULLPTR
+#endif
+// Use BOOST_NO_CXX11_RAW_LITERALS instead of BOOST_NO_RAW_LITERALS
+#if defined(BOOST_NO_CXX11_RAW_LITERALS) && !defined(BOOST_NO_RAW_LITERALS)
+# define BOOST_NO_RAW_LITERALS
+#endif
+// Use BOOST_NO_CXX11_RVALUE_REFERENCES instead of BOOST_NO_RVALUE_REFERENCES
+#if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_RVALUE_REFERENCES)
+# define BOOST_NO_RVALUE_REFERENCES
+#endif
+// Use BOOST_NO_CXX11_SCOPED_ENUMS instead of BOOST_NO_SCOPED_ENUMS
+#if defined(BOOST_NO_CXX11_SCOPED_ENUMS) && !defined(BOOST_NO_SCOPED_ENUMS)
+# define BOOST_NO_SCOPED_ENUMS
+#endif
+// Use BOOST_NO_CXX11_STATIC_ASSERT instead of BOOST_NO_STATIC_ASSERT
+#if defined(BOOST_NO_CXX11_STATIC_ASSERT) && !defined(BOOST_NO_STATIC_ASSERT)
+# define BOOST_NO_STATIC_ASSERT
+#endif
+// Use BOOST_NO_CXX11_STD_UNORDERD instead of BOOST_NO_STD_UNORDERD
+#if defined(BOOST_NO_CXX11_STD_UNORDERD) && !defined(BOOST_NO_STD_UNORDERD)
+# define BOOST_NO_STD_UNORDERD
+#endif
+// Use BOOST_NO_CXX11_UNICODE_LITERALS instead of BOOST_NO_UNICODE_LITERALS
+#if defined(BOOST_NO_CXX11_UNICODE_LITERALS) && !defined(BOOST_NO_UNICODE_LITERALS)
+# define BOOST_NO_UNICODE_LITERALS
+#endif
+// Use BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX instead of BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#if defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) && !defined(BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX)
+# define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#endif
+// Use BOOST_NO_CXX11_VARIADIC_TEMPLATES instead of BOOST_NO_VARIADIC_TEMPLATES
+#if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_VARIADIC_TEMPLATES)
+# define BOOST_NO_VARIADIC_TEMPLATES
+#endif
+// Use BOOST_NO_CXX11_VARIADIC_MACROS instead of BOOST_NO_VARIADIC_MACROS
+#if defined(BOOST_NO_CXX11_VARIADIC_MACROS) && !defined(BOOST_NO_VARIADIC_MACROS)
+# define BOOST_NO_VARIADIC_MACROS
+#endif
+// ------------------ End of deprecated macros for 1.51 ---------------------------
+
+
+
+//
+// Helper macros BOOST_NOEXCEPT, BOOST_NOEXCEPT_IF, BOOST_NOEXCEPT_EXPR
+// These aid the transition to C++11 while still supporting C++03 compilers
+//
+#ifdef BOOST_NO_NOEXCEPT
+# define BOOST_NOEXCEPT
+# define BOOST_NOEXCEPT_IF(Predicate)
+# define BOOST_NOEXCEPT_EXPR(Expression) false
+#else
+# define BOOST_NOEXCEPT noexcept
+# define BOOST_NOEXCEPT_IF(Predicate) noexcept((Predicate))
+# define BOOST_NOEXCEPT_EXPR(Expression) noexcept((Expression))
+#endif
+
+//
+// Normalize BOOST_NO_STATIC_ASSERT and (depricated) BOOST_HAS_STATIC_ASSERT:
+//
+#if !defined(BOOST_NO_STATIC_ASSERT) && !defined(BOOST_HAS_STATIC_ASSERT)
+# define BOOST_HAS_STATIC_ASSERT
+#endif
+
+//
+// constexpr workarounds
+//
+#if defined(BOOST_NO_CONSTEXPR)
+#define BOOST_CONSTEXPR
+#define BOOST_CONSTEXPR_OR_CONST const
+#else
+#define BOOST_CONSTEXPR constexpr
+#define BOOST_CONSTEXPR_OR_CONST constexpr
+#endif
+
+#define BOOST_STATIC_CONSTEXPR static BOOST_CONSTEXPR_OR_CONST
+
+//
+// Set BOOST_HAS_RVALUE_REFS when BOOST_NO_RVALUE_REFERENCES is not defined
+//
+#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_HAS_RVALUE_REFS)
+#define BOOST_HAS_RVALUE_REFS
+#endif
+
+//
+// Set BOOST_HAS_VARIADIC_TMPL when BOOST_NO_VARIADIC_TEMPLATES is not defined
+//
+#if !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_HAS_VARIADIC_TMPL)
+#define BOOST_HAS_VARIADIC_TMPL
+#endif
+
+//
+// Set BOOST_NO_DECLTYPE_N3276 when BOOST_NO_DECLTYPE is defined
+//
+#if !defined(BOOST_NO_DECLTYPE_N3276) && defined(BOOST_NO_DECLTYPE)
+#define BOOST_NO_DECLTYPE_N3276
+#endif
+
+
#endif
diff --git a/test/all/Jamfile.v2 b/test/all/Jamfile.v2
index b839b995..a57651f1 100644
--- a/test/all/Jamfile.v2
+++ b/test/all/Jamfile.v2
@@ -184,10 +184,10 @@ test-suite "BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP" :
test-suite "BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS" :
[ run ../no_array_type_spec_pass.cpp ]
[ compile-fail ../no_array_type_spec_fail.cpp ] ;
-test-suite "BOOST_NO_AUTO_DECLARATIONS" :
+test-suite "BOOST_NO_CXX11_AUTO_DECLARATIONS" :
[ run ../no_auto_declarations_pass.cpp ]
[ compile-fail ../no_auto_declarations_fail.cpp ] ;
-test-suite "BOOST_NO_AUTO_MULTIDECLARATIONS" :
+test-suite "BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS" :
[ run ../no_auto_multidecl_pass.cpp ]
[ compile-fail ../no_auto_multidecl_fail.cpp ] ;
test-suite "BOOST_NO_AUTO_PTR" :
@@ -196,16 +196,16 @@ test-suite "BOOST_NO_AUTO_PTR" :
test-suite "BOOST_BCB_PARTIAL_SPECIALIZATION_BUG" :
[ run ../no_bcb_partial_spec_pass.cpp ]
[ compile-fail ../no_bcb_partial_spec_fail.cpp ] ;
-test-suite "BOOST_NO_CHAR16_T" :
+test-suite "BOOST_NO_CXX11_CHAR16_T" :
[ run ../no_char16_t_pass.cpp ]
[ compile-fail ../no_char16_t_fail.cpp ] ;
-test-suite "BOOST_NO_CHAR32_T" :
+test-suite "BOOST_NO_CXX11_CHAR16_T" :
[ run ../no_char32_t_pass.cpp ]
[ compile-fail ../no_char32_t_fail.cpp ] ;
test-suite "BOOST_NO_COMPLETE_VALUE_INITIALIZATION" :
[ run ../no_com_value_init_pass.cpp ]
[ compile-fail ../no_com_value_init_fail.cpp ] ;
-test-suite "BOOST_NO_CONSTEXPR" :
+test-suite "BOOST_NO_CXX11_CONSTEXPR" :
[ run ../no_constexpr_pass.cpp ]
[ compile-fail ../no_constexpr_fail.cpp ] ;
test-suite "BOOST_NO_CTYPE_FUNCTIONS" :
@@ -289,19 +289,19 @@ test-suite "BOOST_NO_CXX11_SMART_PTR" :
test-suite "BOOST_NO_CXX11_HDR_FUNCTIONAL" :
[ run ../no_cxx_hdr_functional_pass.cpp ]
[ compile-fail ../no_cxx_hdr_functional_fail.cpp ] ;
-test-suite "BOOST_NO_DECLTYPE" :
+test-suite "BOOST_NO_CXX11_DECLTYPE" :
[ run ../no_decltype_pass.cpp ]
[ compile-fail ../no_decltype_fail.cpp ] ;
-test-suite "BOOST_NO_DECLTYPE_N3276" :
+test-suite "BOOST_NO_CXX11_DECLTYPE_N3276" :
[ run ../no_decltype_n3276_pass.cpp ]
[ compile-fail ../no_decltype_n3276_fail.cpp ] ;
test-suite "BOOST_DEDUCED_TYPENAME" :
[ run ../no_ded_typename_pass.cpp ]
[ compile-fail ../no_ded_typename_fail.cpp ] ;
-test-suite "BOOST_NO_DEFAULTED_FUNCTIONS" :
+test-suite "BOOST_NO_CXX11_DEFAULTED_FUNCTIONS" :
[ run ../no_defaulted_functions_pass.cpp ]
[ compile-fail ../no_defaulted_functions_fail.cpp ] ;
-test-suite "BOOST_NO_DELETED_FUNCTIONS" :
+test-suite "BOOST_NO_CXX11_DELETED_FUNCTIONS" :
[ run ../no_deleted_functions_pass.cpp ]
[ compile-fail ../no_deleted_functions_fail.cpp ] ;
test-suite "BOOST_NO_DEPENDENT_NESTED_DERIVATIONS" :
@@ -316,19 +316,19 @@ test-suite "BOOST_NO_EXCEPTIONS" :
test-suite "BOOST_NO_EXCEPTION_STD_NAMESPACE" :
[ run ../no_excep_std_pass.cpp ]
[ compile-fail ../no_excep_std_fail.cpp ] ;
-test-suite "BOOST_NO_EXPLICIT_CONVERSION_OPERATORS" :
+test-suite "BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS" :
[ run ../no_explicit_cvt_ops_pass.cpp ]
[ compile-fail ../no_explicit_cvt_ops_fail.cpp ] ;
test-suite "BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS" :
[ run ../no_exp_func_tem_arg_pass.cpp ]
[ compile-fail ../no_exp_func_tem_arg_fail.cpp ] ;
-test-suite "BOOST_NO_EXTERN_TEMPLATE" :
+test-suite "BOOST_NO_CXX11_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" :
+test-suite "BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS" :
[ run ../no_function_template_default_args_pass.cpp ]
[ compile-fail ../no_function_template_default_args_fail.cpp ] ;
test-suite "BOOST_NO_FUNCTION_TYPE_SPECIALIZATIONS" :
@@ -358,7 +358,7 @@ test-suite "BOOST_NO_IS_ABSTRACT" :
test-suite "BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS" :
[ run ../no_iter_construct_pass.cpp ]
[ compile-fail ../no_iter_construct_fail.cpp ] ;
-test-suite "BOOST_NO_LAMBDAS" :
+test-suite "BOOST_NO_CXX11_LAMBDAS" :
[ run ../no_lambdas_pass.cpp ]
[ compile-fail ../no_lambdas_fail.cpp ] ;
test-suite "BOOST_NO_LIMITS" :
@@ -394,10 +394,10 @@ test-suite "BOOST_NO_POINTER_TO_MEMBER_TEMPLATE_PARAMETERS" :
test-suite "BOOST_NO_NESTED_FRIENDSHIP" :
[ run ../no_nested_friendship_pass.cpp ]
[ compile-fail ../no_nested_friendship_fail.cpp ] ;
-test-suite "BOOST_NO_NOEXCEPT" :
+test-suite "BOOST_NO_CXX11_NOEXCEPT" :
[ run ../no_noexcept_pass.cpp ]
[ compile-fail ../no_noexcept_fail.cpp ] ;
-test-suite "BOOST_NO_NULLPTR" :
+test-suite "BOOST_NO_CXX11_NULLPTR" :
[ run ../no_nullptr_pass.cpp ]
[ compile-fail ../no_nullptr_fail.cpp ] ;
test-suite "BOOST_NO_OPERATORS_IN_NAMESPACE" :
@@ -415,7 +415,7 @@ test-suite "BOOST_NO_PRIVATE_IN_AGGREGATE" :
test-suite "BOOST_NO_POINTER_TO_MEMBER_CONST" :
[ run ../no_ptr_mem_const_pass.cpp ]
[ compile-fail ../no_ptr_mem_const_fail.cpp ] ;
-test-suite "BOOST_NO_RAW_LITERALS" :
+test-suite "BOOST_NO_CXX11_RAW_LITERALS" :
[ run ../no_raw_literals_pass.cpp ]
[ compile-fail ../no_raw_literals_fail.cpp ] ;
test-suite "BOOST_NO_UNREACHABLE_RETURN_DETECTION" :
@@ -424,10 +424,10 @@ test-suite "BOOST_NO_UNREACHABLE_RETURN_DETECTION" :
test-suite "BOOST_NO_RTTI" :
[ run ../no_rtti_pass.cpp ]
[ compile-fail ../no_rtti_fail.cpp ] ;
-test-suite "BOOST_NO_RVALUE_REFERENCES" :
+test-suite "BOOST_NO_CXX11_RVALUE_REFERENCES" :
[ run ../no_rvalue_references_pass.cpp ]
[ compile-fail ../no_rvalue_references_fail.cpp ] ;
-test-suite "BOOST_NO_SCOPED_ENUMS" :
+test-suite "BOOST_NO_CXX11_SCOPED_ENUMS" :
[ run ../no_scoped_enums_pass.cpp ]
[ compile-fail ../no_scoped_enums_fail.cpp ] ;
test-suite "BOOST_NO_SFINAE" :
@@ -439,7 +439,7 @@ test-suite "BOOST_NO_SFINAE_EXPR" :
test-suite "BOOST_NO_STRINGSTREAM" :
[ run ../no_sstream_pass.cpp ]
[ compile-fail ../no_sstream_fail.cpp ] ;
-test-suite "BOOST_NO_STATIC_ASSERT" :
+test-suite "BOOST_NO_CXX11_STATIC_ASSERT" :
[ run ../no_static_assert_pass.cpp ]
[ compile-fail ../no_static_assert_fail.cpp ] ;
test-suite "BOOST_NO_STDC_NAMESPACE" :
@@ -487,7 +487,7 @@ test-suite "BOOST_NO_STD_WSTRING" :
test-suite "BOOST_NO_SWPRINTF" :
[ run ../no_swprintf_pass.cpp ]
[ compile-fail ../no_swprintf_fail.cpp ] ;
-test-suite "BOOST_NO_TEMPLATE_ALIASES" :
+test-suite "BOOST_NO_CXX11_TEMPLATE_ALIASES" :
[ run ../no_template_aliases_pass.cpp ]
[ compile-fail ../no_template_aliases_fail.cpp ] ;
test-suite "BOOST_NO_TEMPLATED_IOSTREAMS" :
@@ -496,7 +496,7 @@ test-suite "BOOST_NO_TEMPLATED_IOSTREAMS" :
test-suite "BOOST_NO_TEMPLATE_TEMPLATES" :
[ run ../no_template_template_pass.cpp ]
[ compile-fail ../no_template_template_fail.cpp ] ;
-test-suite "BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS" :
+test-suite "BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS" :
[ run ../no_tem_local_classes_pass.cpp ]
[ compile-fail ../no_tem_local_classes_fail.cpp ] ;
test-suite "BOOST_NO_TWO_PHASE_NAME_LOOKUP" :
@@ -508,10 +508,10 @@ test-suite "BOOST_NO_TYPEID" :
test-suite "BOOST_NO_TYPENAME_WITH_CTOR" :
[ run ../no_typename_with_ctor_pass.cpp ]
[ compile-fail ../no_typename_with_ctor_fail.cpp ] ;
-test-suite "BOOST_NO_UNICODE_LITERALS" :
+test-suite "BOOST_NO_CXX11_UNICODE_LITERALS" :
[ run ../no_unicode_literals_pass.cpp ]
[ compile-fail ../no_unicode_literals_fail.cpp ] ;
-test-suite "BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX" :
+test-suite "BOOST_NO_CXX11_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" :
@@ -523,10 +523,10 @@ test-suite "BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE" :
test-suite "BOOST_NO_USING_TEMPLATE" :
[ run ../no_using_template_pass.cpp ]
[ compile-fail ../no_using_template_fail.cpp ] ;
-test-suite "BOOST_NO_VARIADIC_MACROS" :
+test-suite "BOOST_NO_CXX11_VARIADIC_MACROS" :
[ run ../no_variadic_macros_pass.cpp ]
[ compile-fail ../no_variadic_macros_fail.cpp ] ;
-test-suite "BOOST_NO_VARIADIC_TEMPLATES" :
+test-suite "BOOST_NO_CXX11_VARIADIC_TEMPLATES" :
[ run ../no_variadic_templates_pass.cpp ]
[ compile-fail ../no_variadic_templates_fail.cpp ] ;
test-suite "BOOST_NO_VOID_RETURNS" :
diff --git a/test/boost_no_auto_declarations.ipp b/test/boost_no_auto_declarations.ipp
index 65410827..6b2ff1f5 100644
--- a/test/boost_no_auto_declarations.ipp
+++ b/test/boost_no_auto_declarations.ipp
@@ -5,7 +5,7 @@
// See http://www.boost.org/libs/config for most recent version.
-// MACRO: BOOST_NO_AUTO_DECLARATIONS
+// MACRO: BOOST_NO_CXX11_AUTO_DECLARATIONS
// TITLE: C++0x auto declarators unavailable
// DESCRIPTION: The compiler does not support C++0x declarations of variables with automatically deduced type
diff --git a/test/boost_no_auto_multidecl.ipp b/test/boost_no_auto_multidecl.ipp
index ea976612..d5800910 100644
--- a/test/boost_no_auto_multidecl.ipp
+++ b/test/boost_no_auto_multidecl.ipp
@@ -5,7 +5,7 @@
// See http://www.boost.org/libs/config for most recent version.
-// MACRO: BOOST_NO_AUTO_MULTIDECLARATIONS
+// MACRO: BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
// TITLE: C++0x auto multideclarators unavailable
// DESCRIPTION: The compiler does not support C++0x declarations of series of variables with automatically deduced type
diff --git a/test/boost_no_char16_t.ipp b/test/boost_no_char16_t.ipp
index 27d49c62..6eb43aaf 100644
--- a/test/boost_no_char16_t.ipp
+++ b/test/boost_no_char16_t.ipp
@@ -7,7 +7,7 @@
// See http://www.boost.org/libs/config for more information.
-// MACRO: BOOST_NO_CHAR16_T
+// MACRO: BOOST_NO_CXX11_CHAR16_T
// TITLE: C++0x char16_t unavailable
// DESCRIPTION: The compiler does not support C++0x char16_t
diff --git a/test/boost_no_char32_t.ipp b/test/boost_no_char32_t.ipp
index 5dfcd15d..2f1abd72 100644
--- a/test/boost_no_char32_t.ipp
+++ b/test/boost_no_char32_t.ipp
@@ -6,7 +6,7 @@
// See http://www.boost.org/libs/config for more information.
-// MACRO: BOOST_NO_CHAR32_T
+// MACRO: BOOST_NO_CXX11_CHAR32_T
// TITLE: C++0x char32_t unavailable
// DESCRIPTION: The compiler does not support C++0x char32_t
diff --git a/test/boost_no_constexpr.ipp b/test/boost_no_constexpr.ipp
index bc0ad7cc..dbbf2440 100644
--- a/test/boost_no_constexpr.ipp
+++ b/test/boost_no_constexpr.ipp
@@ -6,7 +6,7 @@
// See http://www.boost.org/libs/config for more information.
-// MACRO: BOOST_NO_CONSTEXPR
+// MACRO: BOOST_NO_CXX11_CONSTEXPR
// TITLE: C++0x constexpr unavailable
// DESCRIPTION: The compiler does not support C++0x constexpr
diff --git a/test/boost_no_decltype.ipp b/test/boost_no_decltype.ipp
index e67f55af..21eba391 100644
--- a/test/boost_no_decltype.ipp
+++ b/test/boost_no_decltype.ipp
@@ -7,7 +7,7 @@
// See http://www.boost.org/libs/config for more information.
-// MACRO: BOOST_NO_DECLTYPE
+// MACRO: BOOST_NO_CXX11_DECLTYPE
// TITLE: C++0x decltype unavailable
// DESCRIPTION: The compiler does not support C++0x decltype
diff --git a/test/boost_no_decltype_n3276.ipp b/test/boost_no_decltype_n3276.ipp
index f0c3688b..d12a7c82 100644
--- a/test/boost_no_decltype_n3276.ipp
+++ b/test/boost_no_decltype_n3276.ipp
@@ -7,7 +7,7 @@
// See http://www.boost.org/libs/config for more information.
-// MACRO: BOOST_NO_DECLTYPE_N3276
+// MACRO: BOOST_NO_CXX11_DECLTYPE_N3276
// TITLE: C++0x decltype v1.1 unavailable
// DESCRIPTION: The compiler does not support extensions to C++0x
// decltype as described in N3276 and accepted in Madrid,
diff --git a/test/boost_no_defaulted_functions.ipp b/test/boost_no_defaulted_functions.ipp
index fcf02fd0..4b8d5bde 100644
--- a/test/boost_no_defaulted_functions.ipp
+++ b/test/boost_no_defaulted_functions.ipp
@@ -6,7 +6,7 @@
// See http://www.boost.org/libs/config for more information.
-// MACRO: BOOST_NO_DEFAULTED_FUNCTIONS
+// MACRO: BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
// TITLE: C++0x defaulted functions unavailable
// DESCRIPTION: The compiler does not support C++0x defaulted functions
diff --git a/test/boost_no_deleted_functions.ipp b/test/boost_no_deleted_functions.ipp
index 00397dff..8ca0506d 100644
--- a/test/boost_no_deleted_functions.ipp
+++ b/test/boost_no_deleted_functions.ipp
@@ -6,7 +6,7 @@
// See http://www.boost.org/libs/config for more information.
-// MACRO: BOOST_NO_DELETED_FUNCTIONS
+// MACRO: BOOST_NO_CXX11_DELETED_FUNCTIONS
// TITLE: C++0x =delete functions unavailable
// DESCRIPTION: The compiler does not support C++0x =delete functions
diff --git a/test/boost_no_explicit_cvt_ops.ipp b/test/boost_no_explicit_cvt_ops.ipp
index c0d68c45..e8c4a59f 100644
--- a/test/boost_no_explicit_cvt_ops.ipp
+++ b/test/boost_no_explicit_cvt_ops.ipp
@@ -6,7 +6,7 @@
// See http://www.boost.org/libs/config for more information.
-// MACRO: BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+// MACRO: BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
// TITLE: C++0x explicit conversion operators unavailable
// DESCRIPTION: The compiler does not support C++0x explicit conversion operators
diff --git a/test/boost_no_extern_template.ipp b/test/boost_no_extern_template.ipp
index 0965470b..434fa041 100644
--- a/test/boost_no_extern_template.ipp
+++ b/test/boost_no_extern_template.ipp
@@ -6,7 +6,7 @@
// See http://www.boost.org/libs/config for more information.
-// MACRO: BOOST_NO_EXTERN_TEMPLATE
+// MACRO: BOOST_NO_CXX11_EXTERN_TEMPLATE
// TITLE: C++0x extern template unavailable
// DESCRIPTION: The compiler does not support C++0x extern template
diff --git a/test/boost_no_function_template_default_args.ipp b/test/boost_no_function_template_default_args.ipp
index 686d44ce..ca2cb31c 100644
--- a/test/boost_no_function_template_default_args.ipp
+++ b/test/boost_no_function_template_default_args.ipp
@@ -5,7 +5,7 @@
// See http://www.boost.org/libs/config for the most recent version.
-// MACRO: BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+// MACRO: BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
// TITLE: Default template arguments for function templates
// DESCRIPTION: Default template arguments for function templates are not supported.
diff --git a/test/boost_no_lambdas.ipp b/test/boost_no_lambdas.ipp
index 3f6ae2b0..9e53a895 100644
--- a/test/boost_no_lambdas.ipp
+++ b/test/boost_no_lambdas.ipp
@@ -6,7 +6,7 @@
// See http://www.boost.org/libs/config for more information.
-// MACRO: BOOST_NO_LAMBDAS
+// MACRO: BOOST_NO_CXX11_LAMBDAS
// TITLE: C++0x lambda feature unavailable
// DESCRIPTION: The compiler does not support the C++0x lambda feature
diff --git a/test/boost_no_noexcept.ipp b/test/boost_no_noexcept.ipp
index f041ef41..2b425977 100644
--- a/test/boost_no_noexcept.ipp
+++ b/test/boost_no_noexcept.ipp
@@ -5,7 +5,7 @@
// See http://www.boost.org/libs/config for most recent version.
-// MACRO: BOOST_NO_NOEXCEPT
+// MACRO: BOOST_NO_CXX11_NOEXCEPT
// TITLE: C++0x noexcept unavailable
// DESCRIPTION: The compiler does not support C++0x noexcept
diff --git a/test/boost_no_nullptr.ipp b/test/boost_no_nullptr.ipp
index dd06f7fd..ad2d4df3 100644
--- a/test/boost_no_nullptr.ipp
+++ b/test/boost_no_nullptr.ipp
@@ -6,7 +6,7 @@
// See http://www.boost.org/libs/config for more information.
-// MACRO: BOOST_NO_NULLPTR
+// MACRO: BOOST_NO_CXX11_NULLPTR
// TITLE: C++0x nullptr feature unavailable
// DESCRIPTION: The compiler does not support the C++0x nullptr feature
diff --git a/test/boost_no_raw_literals.ipp b/test/boost_no_raw_literals.ipp
index 3362db30..fa1c74ba 100644
--- a/test/boost_no_raw_literals.ipp
+++ b/test/boost_no_raw_literals.ipp
@@ -6,7 +6,7 @@
// See http://www.boost.org/libs/config for more information.
-// MACRO: BOOST_NO_RAW_LITERALS
+// MACRO: BOOST_NO_CXX11_RAW_LITERALS
// TITLE: C++0x raw string literals unavailable
// DESCRIPTION: The compiler does not support C++0x raw string literals
diff --git a/test/boost_no_rvalue_references.ipp b/test/boost_no_rvalue_references.ipp
index 4540bb64..c868f9dd 100644
--- a/test/boost_no_rvalue_references.ipp
+++ b/test/boost_no_rvalue_references.ipp
@@ -5,7 +5,7 @@
// See http://www.boost.org/libs/config for most recent version.
-// MACRO: BOOST_NO_RVALUE_REFERENCES
+// MACRO: BOOST_NO_CXX11_RVALUE_REFERENCES
// TITLE: C++0x rvalue references unavailable
// DESCRIPTION: The compiler does not support C++0x rvalue references
diff --git a/test/boost_no_scoped_enums.ipp b/test/boost_no_scoped_enums.ipp
index 8b6a4a66..10f029ee 100644
--- a/test/boost_no_scoped_enums.ipp
+++ b/test/boost_no_scoped_enums.ipp
@@ -6,7 +6,7 @@
// See http://www.boost.org/libs/config for more information.
-// MACRO: BOOST_NO_SCOPED_ENUMS
+// MACRO: BOOST_NO_CXX11_SCOPED_ENUMS
// TITLE: C++0x scoped enum unavailable
// DESCRIPTION: The compiler does not support C++0x scoped enum
diff --git a/test/boost_no_static_assert.ipp b/test/boost_no_static_assert.ipp
index 858d91bc..9176590e 100644
--- a/test/boost_no_static_assert.ipp
+++ b/test/boost_no_static_assert.ipp
@@ -5,7 +5,7 @@
// See http://www.boost.org/libs/config for most recent version.
-// MACRO: BOOST_NO_STATIC_ASSERT
+// MACRO: BOOST_NO_CXX11_STATIC_ASSERT
// TITLE: C++0x static_assert unavailable
// DESCRIPTION: The compiler does not support C++0x static assertions
diff --git a/test/boost_no_tem_local_classes.ipp b/test/boost_no_tem_local_classes.ipp
index ed5e701d..4e975e41 100644
--- a/test/boost_no_tem_local_classes.ipp
+++ b/test/boost_no_tem_local_classes.ipp
@@ -5,7 +5,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://www.boost.org/libs/config
-// MACRO: BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
+// MACRO: BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
// TITLE: local classes as template parameters
// DESCRIPTION: Local classes cannot be passed as template parameters.
diff --git a/test/boost_no_template_aliases.ipp b/test/boost_no_template_aliases.ipp
index e420da78..3db0986b 100644
--- a/test/boost_no_template_aliases.ipp
+++ b/test/boost_no_template_aliases.ipp
@@ -6,7 +6,7 @@
// See http://www.boost.org/libs/config for more information.
-// MACRO: BOOST_NO_TEMPLATE_ALIASES
+// MACRO: BOOST_NO_CXX11_TEMPLATE_ALIASES
// TITLE: C++0x template_aliases feature unavailable
// DESCRIPTION: The compiler does not support the C++0x template_aliases feature
diff --git a/test/boost_no_unicode_literals.ipp b/test/boost_no_unicode_literals.ipp
index ec8963ba..57d5b58f 100644
--- a/test/boost_no_unicode_literals.ipp
+++ b/test/boost_no_unicode_literals.ipp
@@ -6,7 +6,7 @@
// See http://www.boost.org/libs/config for more information.
-// MACRO: BOOST_NO_UNICODE_LITERALS
+// MACRO: BOOST_NO_CXX11_UNICODE_LITERALS
// TITLE: C++0x unicode literals unavailable
// DESCRIPTION: The compiler does not support C++0x Unicode literals (N2442)
diff --git a/test/boost_no_unified_init.ipp b/test/boost_no_unified_init.ipp
index 1cb2243f..7e735c8c 100644
--- a/test/boost_no_unified_init.ipp
+++ b/test/boost_no_unified_init.ipp
@@ -5,7 +5,7 @@
// See http://www.boost.org/libs/config for most recent version.
-// MACRO: BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+// MACRO: BOOST_NO_CXX11_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
diff --git a/test/boost_no_variadic_macros.ipp b/test/boost_no_variadic_macros.ipp
index 7df683b3..3f92215d 100644
--- a/test/boost_no_variadic_macros.ipp
+++ b/test/boost_no_variadic_macros.ipp
@@ -5,7 +5,7 @@
// See http://www.boost.org/libs/config for most recent version.
-// MACRO: BOOST_NO_VARIADIC_MACROS
+// MACRO: BOOST_NO_CXX11_VARIADIC_MACROS
// TITLE: C++0x variadic macros unavailable
// DESCRIPTION: The compiler does not support C++0x variadic macros
diff --git a/test/boost_no_variadic_templates.ipp b/test/boost_no_variadic_templates.ipp
index 68af2d71..46b4d9da 100644
--- a/test/boost_no_variadic_templates.ipp
+++ b/test/boost_no_variadic_templates.ipp
@@ -5,7 +5,7 @@
// See http://www.boost.org/libs/config for most recent version.
-// MACRO: BOOST_NO_VARIADIC_TEMPLATES
+// MACRO: BOOST_NO_CXX11_VARIADIC_TEMPLATES
// TITLE: C++0x variadic templates unavailable
// DESCRIPTION: The compiler does not support C++0x variadic templates
diff --git a/test/config_info.cpp b/test/config_info.cpp
index 46984132..d9460e9d 100644
--- a/test/config_info.cpp
+++ b/test/config_info.cpp
@@ -982,13 +982,13 @@ void print_boost_macros()
PRINT_MACRO(BOOST_NO_ADL_BARRIER);
PRINT_MACRO(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP);
PRINT_MACRO(BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS);
- PRINT_MACRO(BOOST_NO_AUTO_DECLARATIONS);
- PRINT_MACRO(BOOST_NO_AUTO_MULTIDECLARATIONS);
+ PRINT_MACRO(BOOST_NO_CXX11_AUTO_DECLARATIONS);
+ PRINT_MACRO(BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS);
PRINT_MACRO(BOOST_NO_AUTO_PTR);
- PRINT_MACRO(BOOST_NO_CHAR16_T);
- PRINT_MACRO(BOOST_NO_CHAR32_T);
+ PRINT_MACRO(BOOST_NO_CXX11_CHAR16_T);
+ PRINT_MACRO(BOOST_NO_CXX11_CHAR32_T);
PRINT_MACRO(BOOST_NO_COMPLETE_VALUE_INITIALIZATION);
- PRINT_MACRO(BOOST_NO_CONSTEXPR);
+ PRINT_MACRO(BOOST_NO_CXX11_CONSTEXPR);
PRINT_MACRO(BOOST_NO_CTYPE_FUNCTIONS);
PRINT_MACRO(BOOST_NO_CV_SPECIALIZATIONS);
PRINT_MACRO(BOOST_NO_CV_VOID_SPECIALIZATIONS);
@@ -1016,19 +1016,19 @@ void print_boost_macros()
PRINT_MACRO(BOOST_NO_CXX11_HDR_UNORDERED_MAP);
PRINT_MACRO(BOOST_NO_CXX11_HDR_UNORDERED_SET);
PRINT_MACRO(BOOST_NO_CXX11_SMART_PTR);
- PRINT_MACRO(BOOST_NO_DECLTYPE);
- PRINT_MACRO(BOOST_NO_DECLTYPE_N3276);
- PRINT_MACRO(BOOST_NO_DEFAULTED_FUNCTIONS);
- PRINT_MACRO(BOOST_NO_DELETED_FUNCTIONS);
+ PRINT_MACRO(BOOST_NO_CXX11_DECLTYPE);
+ PRINT_MACRO(BOOST_NO_CXX11_DECLTYPE_N3276);
+ PRINT_MACRO(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS);
+ PRINT_MACRO(BOOST_NO_CXX11_DELETED_FUNCTIONS);
PRINT_MACRO(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS);
PRINT_MACRO(BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS);
PRINT_MACRO(BOOST_NO_EXCEPTIONS);
PRINT_MACRO(BOOST_NO_EXCEPTION_STD_NAMESPACE);
- PRINT_MACRO(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS);
+ PRINT_MACRO(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS);
PRINT_MACRO(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS);
- PRINT_MACRO(BOOST_NO_EXTERN_TEMPLATE);
+ PRINT_MACRO(BOOST_NO_CXX11_EXTERN_TEMPLATE);
PRINT_MACRO(BOOST_NO_FENV_H);
- PRINT_MACRO(BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS);
+ PRINT_MACRO(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS);
PRINT_MACRO(BOOST_NO_FUNCTION_TEMPLATE_ORDERING);
PRINT_MACRO(BOOST_NO_FUNCTION_TYPE_SPECIALIZATIONS);
PRINT_MACRO(BOOST_NO_INCLASS_MEMBER_INITIALIZATION);
@@ -1037,10 +1037,10 @@ void print_boost_macros()
PRINT_MACRO(BOOST_NO_IOSFWD);
PRINT_MACRO(BOOST_NO_IOSTREAM);
PRINT_MACRO(BOOST_NO_IS_ABSTRACT);
- PRINT_MACRO(BOOST_NO_LAMBDAS);
+ PRINT_MACRO(BOOST_NO_CXX11_LAMBDAS);
PRINT_MACRO(BOOST_NO_LIMITS);
PRINT_MACRO(BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS);
- PRINT_MACRO(BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS);
+ PRINT_MACRO(BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS);
PRINT_MACRO(BOOST_NO_LONG_LONG);
PRINT_MACRO(BOOST_NO_LONG_LONG_NUMERIC_LIMITS);
PRINT_MACRO(BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS);
@@ -1049,21 +1049,21 @@ 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_CXX11_NOEXCEPT);
+ PRINT_MACRO(BOOST_NO_CXX11_NULLPTR);
PRINT_MACRO(BOOST_NO_NUMERIC_LIMITS_LOWEST);
PRINT_MACRO(BOOST_NO_OPERATORS_IN_NAMESPACE);
PRINT_MACRO(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS);
PRINT_MACRO(BOOST_NO_POINTER_TO_MEMBER_CONST);
PRINT_MACRO(BOOST_NO_POINTER_TO_MEMBER_TEMPLATE_PARAMETERS);
PRINT_MACRO(BOOST_NO_PRIVATE_IN_AGGREGATE);
- PRINT_MACRO(BOOST_NO_RAW_LITERALS);
+ PRINT_MACRO(BOOST_NO_CXX11_RAW_LITERALS);
PRINT_MACRO(BOOST_NO_RTTI);
- PRINT_MACRO(BOOST_NO_RVALUE_REFERENCES);
- PRINT_MACRO(BOOST_NO_SCOPED_ENUMS);
+ PRINT_MACRO(BOOST_NO_CXX11_RVALUE_REFERENCES);
+ PRINT_MACRO(BOOST_NO_CXX11_SCOPED_ENUMS);
PRINT_MACRO(BOOST_NO_SFINAE);
PRINT_MACRO(BOOST_NO_SFINAE_EXPR);
- PRINT_MACRO(BOOST_NO_STATIC_ASSERT);
+ PRINT_MACRO(BOOST_NO_CXX11_STATIC_ASSERT);
PRINT_MACRO(BOOST_NO_STDC_NAMESPACE);
PRINT_MACRO(BOOST_NO_STD_ALLOCATOR);
PRINT_MACRO(BOOST_NO_STD_DISTANCE);
@@ -1082,19 +1082,19 @@ void print_boost_macros()
PRINT_MACRO(BOOST_NO_SWPRINTF);
PRINT_MACRO(BOOST_NO_TEMPLATED_IOSTREAMS);
PRINT_MACRO(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS);
- PRINT_MACRO(BOOST_NO_TEMPLATE_ALIASES);
+ PRINT_MACRO(BOOST_NO_CXX11_TEMPLATE_ALIASES);
PRINT_MACRO(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION);
PRINT_MACRO(BOOST_NO_TEMPLATE_TEMPLATES);
PRINT_MACRO(BOOST_NO_TWO_PHASE_NAME_LOOKUP);
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_CXX11_UNICODE_LITERALS);
+ PRINT_MACRO(BOOST_NO_CXX11_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);
- PRINT_MACRO(BOOST_NO_VARIADIC_MACROS);
- PRINT_MACRO(BOOST_NO_VARIADIC_TEMPLATES);
+ PRINT_MACRO(BOOST_NO_CXX11_VARIADIC_MACROS);
+ PRINT_MACRO(BOOST_NO_CXX11_VARIADIC_TEMPLATES);
PRINT_MACRO(BOOST_NO_VOID_RETURNS);
diff --git a/test/config_test.cpp b/test/config_test.cpp
index 63dd1f70..fdcaec3d 100644
--- a/test/config_test.cpp
+++ b/test/config_test.cpp
@@ -37,12 +37,12 @@ namespace boost_no_argument_dependent_lookup = empty_boost;
#else
namespace boost_no_array_type_specializations = empty_boost;
#endif
-#ifndef BOOST_NO_AUTO_DECLARATIONS
+#ifndef BOOST_NO_CXX11_AUTO_DECLARATIONS
#include "boost_no_auto_declarations.ipp"
#else
namespace boost_no_auto_declarations = empty_boost;
#endif
-#ifndef BOOST_NO_AUTO_MULTIDECLARATIONS
+#ifndef BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
#include "boost_no_auto_multidecl.ipp"
#else
namespace boost_no_auto_multideclarations = empty_boost;
@@ -57,12 +57,12 @@ namespace boost_no_auto_ptr = empty_boost;
#else
namespace boost_bcb_partial_specialization_bug = empty_boost;
#endif
-#ifndef BOOST_NO_CHAR16_T
+#ifndef BOOST_NO_CXX11_CHAR16_T
#include "boost_no_char16_t.ipp"
#else
namespace boost_no_char16_t = empty_boost;
#endif
-#ifndef BOOST_NO_CHAR32_T
+#ifndef BOOST_NO_CXX11_CHAR32_T
#include "boost_no_char32_t.ipp"
#else
namespace boost_no_char32_t = empty_boost;
@@ -72,7 +72,7 @@ namespace boost_no_char32_t = empty_boost;
#else
namespace boost_no_complete_value_initialization = empty_boost;
#endif
-#ifndef BOOST_NO_CONSTEXPR
+#ifndef BOOST_NO_CXX11_CONSTEXPR
#include "boost_no_constexpr.ipp"
#else
namespace boost_no_constexpr = empty_boost;
@@ -212,12 +212,12 @@ namespace boost_no_cxx11_smart_ptr = empty_boost;
#else
namespace boost_no_cxx11_hdr_functional = empty_boost;
#endif
-#ifndef BOOST_NO_DECLTYPE
+#ifndef BOOST_NO_CXX11_DECLTYPE
#include "boost_no_decltype.ipp"
#else
namespace boost_no_decltype = empty_boost;
#endif
-#ifndef BOOST_NO_DECLTYPE_N3276
+#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
#include "boost_no_decltype_n3276.ipp"
#else
namespace boost_no_decltype_n3276 = empty_boost;
@@ -227,12 +227,12 @@ namespace boost_no_decltype_n3276 = empty_boost;
#else
namespace boost_deduced_typename = empty_boost;
#endif
-#ifndef BOOST_NO_DEFAULTED_FUNCTIONS
+#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
#include "boost_no_defaulted_functions.ipp"
#else
namespace boost_no_defaulted_functions = empty_boost;
#endif
-#ifndef BOOST_NO_DELETED_FUNCTIONS
+#ifndef BOOST_NO_CXX11_DELETED_FUNCTIONS
#include "boost_no_deleted_functions.ipp"
#else
namespace boost_no_deleted_functions = empty_boost;
@@ -257,7 +257,7 @@ namespace boost_no_exceptions = empty_boost;
#else
namespace boost_no_exception_std_namespace = empty_boost;
#endif
-#ifndef BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#ifndef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
#include "boost_no_explicit_cvt_ops.ipp"
#else
namespace boost_no_explicit_conversion_operators = empty_boost;
@@ -267,7 +267,7 @@ namespace boost_no_explicit_conversion_operators = empty_boost;
#else
namespace boost_no_explicit_function_template_arguments = empty_boost;
#endif
-#ifndef BOOST_NO_EXTERN_TEMPLATE
+#ifndef BOOST_NO_CXX11_EXTERN_TEMPLATE
#include "boost_no_extern_template.ipp"
#else
namespace boost_no_extern_template = empty_boost;
@@ -277,7 +277,7 @@ namespace boost_no_extern_template = empty_boost;
#else
namespace boost_no_fenv_h = empty_boost;
#endif
-#ifndef BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#ifndef BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
#include "boost_no_function_template_default_args.ipp"
#else
namespace boost_no_function_template_default_args = empty_boost;
@@ -327,7 +327,7 @@ namespace boost_no_is_abstract = empty_boost;
#else
namespace boost_no_templated_iterator_constructors = empty_boost;
#endif
-#ifndef BOOST_NO_LAMBDAS
+#ifndef BOOST_NO_CXX11_LAMBDAS
#include "boost_no_lambdas.ipp"
#else
namespace boost_no_lambdas = empty_boost;
@@ -387,12 +387,12 @@ namespace boost_no_pointer_to_member_template_parameters = empty_boost;
#else
namespace boost_no_nested_friendship = empty_boost;
#endif
-#ifndef BOOST_NO_NOEXCEPT
+#ifndef BOOST_NO_CXX11_NOEXCEPT
#include "boost_no_noexcept.ipp"
#else
namespace boost_no_noexcept = empty_boost;
#endif
-#ifndef BOOST_NO_NULLPTR
+#ifndef BOOST_NO_CXX11_NULLPTR
#include "boost_no_nullptr.ipp"
#else
namespace boost_no_nullptr = empty_boost;
@@ -422,7 +422,7 @@ namespace boost_no_private_in_aggregate = empty_boost;
#else
namespace boost_no_pointer_to_member_const = empty_boost;
#endif
-#ifndef BOOST_NO_RAW_LITERALS
+#ifndef BOOST_NO_CXX11_RAW_LITERALS
#include "boost_no_raw_literals.ipp"
#else
namespace boost_no_raw_literals = empty_boost;
@@ -437,12 +437,12 @@ namespace boost_no_unreachable_return_detection = empty_boost;
#else
namespace boost_no_rtti = empty_boost;
#endif
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
#include "boost_no_rvalue_references.ipp"
#else
namespace boost_no_rvalue_references = empty_boost;
#endif
-#ifndef BOOST_NO_SCOPED_ENUMS
+#ifndef BOOST_NO_CXX11_SCOPED_ENUMS
#include "boost_no_scoped_enums.ipp"
#else
namespace boost_no_scoped_enums = empty_boost;
@@ -462,7 +462,7 @@ namespace boost_no_sfinae_expr = empty_boost;
#else
namespace boost_no_stringstream = empty_boost;
#endif
-#ifndef BOOST_NO_STATIC_ASSERT
+#ifndef BOOST_NO_CXX11_STATIC_ASSERT
#include "boost_no_static_assert.ipp"
#else
namespace boost_no_static_assert = empty_boost;
@@ -542,7 +542,7 @@ namespace boost_no_std_wstring = empty_boost;
#else
namespace boost_no_swprintf = empty_boost;
#endif
-#ifndef BOOST_NO_TEMPLATE_ALIASES
+#ifndef BOOST_NO_CXX11_TEMPLATE_ALIASES
#include "boost_no_template_aliases.ipp"
#else
namespace boost_no_template_aliases = empty_boost;
@@ -557,7 +557,7 @@ namespace boost_no_templated_iostreams = empty_boost;
#else
namespace boost_no_template_templates = empty_boost;
#endif
-#ifndef BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#ifndef BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
#include "boost_no_tem_local_classes.ipp"
#else
namespace boost_no_local_class_template_parameters = empty_boost;
@@ -577,12 +577,12 @@ namespace boost_no_typeid = empty_boost;
#else
namespace boost_no_typename_with_ctor = empty_boost;
#endif
-#ifndef BOOST_NO_UNICODE_LITERALS
+#ifndef BOOST_NO_CXX11_UNICODE_LITERALS
#include "boost_no_unicode_literals.ipp"
#else
namespace boost_no_unicode_literals = empty_boost;
#endif
-#ifndef BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#ifndef BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#include "boost_no_unified_init.ipp"
#else
namespace boost_no_unified_initialization_syntax = empty_boost;
@@ -602,12 +602,12 @@ namespace boost_no_using_declaration_overloads_from_typename_base = empty_boost;
#else
namespace boost_no_using_template = empty_boost;
#endif
-#ifndef BOOST_NO_VARIADIC_MACROS
+#ifndef BOOST_NO_CXX11_VARIADIC_MACROS
#include "boost_no_variadic_macros.ipp"
#else
namespace boost_no_variadic_macros = empty_boost;
#endif
-#ifndef BOOST_NO_VARIADIC_TEMPLATES
+#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#include "boost_no_variadic_templates.ipp"
#else
namespace boost_no_variadic_templates = empty_boost;
@@ -1153,12 +1153,12 @@ int main( int, char *[] )
}
if(0 != boost_no_auto_declarations::test())
{
- std::cerr << "Failed test for BOOST_NO_AUTO_DECLARATIONS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_AUTO_DECLARATIONS at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_auto_multideclarations::test())
{
- std::cerr << "Failed test for BOOST_NO_AUTO_MULTIDECLARATIONS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_auto_ptr::test())
@@ -1173,12 +1173,12 @@ int main( int, char *[] )
}
if(0 != boost_no_char16_t::test())
{
- std::cerr << "Failed test for BOOST_NO_CHAR16_T at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_CHAR16_T at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_char32_t::test())
{
- std::cerr << "Failed test for BOOST_NO_CHAR32_T at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_CHAR32_T at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_complete_value_initialization::test())
@@ -1188,7 +1188,7 @@ int main( int, char *[] )
}
if(0 != boost_no_constexpr::test())
{
- std::cerr << "Failed test for BOOST_NO_CONSTEXPR at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_CONSTEXPR at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_ctype_functions::test())
@@ -1328,12 +1328,12 @@ int main( int, char *[] )
}
if(0 != boost_no_decltype::test())
{
- std::cerr << "Failed test for BOOST_NO_DECLTYPE at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_DECLTYPE at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_decltype_n3276::test())
{
- std::cerr << "Failed test for BOOST_NO_DECLTYPE_N3276 at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_DECLTYPE_N3276 at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_deduced_typename::test())
@@ -1343,12 +1343,12 @@ int main( int, char *[] )
}
if(0 != boost_no_defaulted_functions::test())
{
- std::cerr << "Failed test for BOOST_NO_DEFAULTED_FUNCTIONS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_DEFAULTED_FUNCTIONS at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_deleted_functions::test())
{
- std::cerr << "Failed test for BOOST_NO_DELETED_FUNCTIONS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_DELETED_FUNCTIONS at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_dependent_nested_derivations::test())
@@ -1373,7 +1373,7 @@ int main( int, char *[] )
}
if(0 != boost_no_explicit_conversion_operators::test())
{
- std::cerr << "Failed test for BOOST_NO_EXPLICIT_CONVERSION_OPERATORS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_explicit_function_template_arguments::test())
@@ -1383,7 +1383,7 @@ int main( int, char *[] )
}
if(0 != boost_no_extern_template::test())
{
- std::cerr << "Failed test for BOOST_NO_EXTERN_TEMPLATE at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_EXTERN_TEMPLATE at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_fenv_h::test())
@@ -1393,7 +1393,7 @@ int main( int, char *[] )
}
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;
+ std::cerr << "Failed test for BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_function_type_specializations::test())
@@ -1443,7 +1443,7 @@ int main( int, char *[] )
}
if(0 != boost_no_lambdas::test())
{
- std::cerr << "Failed test for BOOST_NO_LAMBDAS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_LAMBDAS at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_limits::test())
@@ -1503,12 +1503,12 @@ int main( int, char *[] )
}
if(0 != boost_no_noexcept::test())
{
- std::cerr << "Failed test for BOOST_NO_NOEXCEPT at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_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;
+ std::cerr << "Failed test for BOOST_NO_CXX11_NULLPTR at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_operators_in_namespace::test())
@@ -1538,7 +1538,7 @@ int main( int, char *[] )
}
if(0 != boost_no_raw_literals::test())
{
- std::cerr << "Failed test for BOOST_NO_RAW_LITERALS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_RAW_LITERALS at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_unreachable_return_detection::test())
@@ -1553,12 +1553,12 @@ int main( int, char *[] )
}
if(0 != boost_no_rvalue_references::test())
{
- std::cerr << "Failed test for BOOST_NO_RVALUE_REFERENCES at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_RVALUE_REFERENCES at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_scoped_enums::test())
{
- std::cerr << "Failed test for BOOST_NO_SCOPED_ENUMS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_SCOPED_ENUMS at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_sfinae::test())
@@ -1578,7 +1578,7 @@ int main( int, char *[] )
}
if(0 != boost_no_static_assert::test())
{
- std::cerr << "Failed test for BOOST_NO_STATIC_ASSERT at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_STATIC_ASSERT at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_stdc_namespace::test())
@@ -1658,7 +1658,7 @@ int main( int, char *[] )
}
if(0 != boost_no_template_aliases::test())
{
- std::cerr << "Failed test for BOOST_NO_TEMPLATE_ALIASES at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_TEMPLATE_ALIASES at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_templated_iostreams::test())
@@ -1673,7 +1673,7 @@ int main( int, char *[] )
}
if(0 != boost_no_local_class_template_parameters::test())
{
- std::cerr << "Failed test for BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_two_phase_name_lookup::test())
@@ -1693,12 +1693,12 @@ int main( int, char *[] )
}
if(0 != boost_no_unicode_literals::test())
{
- std::cerr << "Failed test for BOOST_NO_UNICODE_LITERALS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_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;
+ std::cerr << "Failed test for BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_function_scope_using_declaration_breaks_adl::test())
@@ -1718,12 +1718,12 @@ int main( int, char *[] )
}
if(0 != boost_no_variadic_macros::test())
{
- std::cerr << "Failed test for BOOST_NO_VARIADIC_MACROS at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_VARIADIC_MACROS at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_variadic_templates::test())
{
- std::cerr << "Failed test for BOOST_NO_VARIADIC_TEMPLATES at: " << __FILE__ << ":" << __LINE__ << std::endl;
+ std::cerr << "Failed test for BOOST_NO_CXX11_VARIADIC_TEMPLATES at: " << __FILE__ << ":" << __LINE__ << std::endl;
++error_count;
}
if(0 != boost_no_void_returns::test())
diff --git a/test/link/link_test.hpp b/test/link/link_test.hpp
index 8d6333bb..c95d963a 100644
--- a/test/link/link_test.hpp
+++ b/test/link/link_test.hpp
@@ -73,7 +73,7 @@ bool BOOST_CONFIG_DECL check_options(
# include
#endif
-#ifndef BOOST_NO_EXTERN_TEMPLATE
+#ifndef BOOST_NO_CXX11_EXTERN_TEMPLATE
template
T test_free_proc(T v)
@@ -101,7 +101,7 @@ extern template BOOST_SYMBOL_IMPORT int test_free_proc(int);
extern template BOOST_SYMBOL_IMPORT int tester::test();
#endif
-#endif // BOOST_NO_EXTERN_TEMPLATE
+#endif // BOOST_NO_CXX11_EXTERN_TEMPLATE
#endif // BOOST_LINK_TEST_HPP
diff --git a/test/link/main.cpp b/test/link/main.cpp
index 3926684a..7233560e 100644
--- a/test/link/main.cpp
+++ b/test/link/main.cpp
@@ -9,7 +9,7 @@
int main()
{
-#ifndef BOOST_NO_EXTERN_TEMPLATE
+#ifndef BOOST_NO_CXX11_EXTERN_TEMPLATE
test_free_proc(0);
tester::test();
#endif
diff --git a/test/no_auto_declarations_fail.cpp b/test/no_auto_declarations_fail.cpp
index a8ba1e64..712bb2b5 100644
--- a/test/no_auto_declarations_fail.cpp
+++ b/test/no_auto_declarations_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_AUTO_DECLARATIONS
+// Test file for macro BOOST_NO_CXX11_AUTO_DECLARATIONS
// This file should not compile, if it does then
-// BOOST_NO_AUTO_DECLARATIONS should not be defined.
+// BOOST_NO_CXX11_AUTO_DECLARATIONS should not be defined.
// See file boost_no_auto_declarations.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_AUTO_DECLARATIONS
+#ifdef BOOST_NO_CXX11_AUTO_DECLARATIONS
#include "boost_no_auto_declarations.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_auto_declarations_pass.cpp b/test/no_auto_declarations_pass.cpp
index 2b479013..5f7099fd 100644
--- a/test/no_auto_declarations_pass.cpp
+++ b/test/no_auto_declarations_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_AUTO_DECLARATIONS
+// Test file for macro BOOST_NO_CXX11_AUTO_DECLARATIONS
// This file should compile, if it does not then
-// BOOST_NO_AUTO_DECLARATIONS should be defined.
+// BOOST_NO_CXX11_AUTO_DECLARATIONS should be defined.
// See file boost_no_auto_declarations.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_AUTO_DECLARATIONS
+#ifndef BOOST_NO_CXX11_AUTO_DECLARATIONS
#include "boost_no_auto_declarations.ipp"
#else
namespace boost_no_auto_declarations = empty_boost;
diff --git a/test/no_auto_multidecl_fail.cpp b/test/no_auto_multidecl_fail.cpp
index 3d028b40..c564e973 100644
--- a/test/no_auto_multidecl_fail.cpp
+++ b/test/no_auto_multidecl_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_AUTO_MULTIDECLARATIONS
+// Test file for macro BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
// This file should not compile, if it does then
-// BOOST_NO_AUTO_MULTIDECLARATIONS should not be defined.
+// BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS should not be defined.
// See file boost_no_auto_multidecl.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_AUTO_MULTIDECLARATIONS
+#ifdef BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
#include "boost_no_auto_multidecl.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_auto_multidecl_pass.cpp b/test/no_auto_multidecl_pass.cpp
index d845232f..47d679d3 100644
--- a/test/no_auto_multidecl_pass.cpp
+++ b/test/no_auto_multidecl_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_AUTO_MULTIDECLARATIONS
+// Test file for macro BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
// This file should compile, if it does not then
-// BOOST_NO_AUTO_MULTIDECLARATIONS should be defined.
+// BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS should be defined.
// See file boost_no_auto_multidecl.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_AUTO_MULTIDECLARATIONS
+#ifndef BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
#include "boost_no_auto_multidecl.ipp"
#else
namespace boost_no_auto_multideclarations = empty_boost;
diff --git a/test/no_char16_t_fail.cpp b/test/no_char16_t_fail.cpp
index 38e1bb5c..adc00260 100644
--- a/test/no_char16_t_fail.cpp
+++ b/test/no_char16_t_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_CHAR16_T
+// Test file for macro BOOST_NO_CXX11_CHAR16_T
// This file should not compile, if it does then
-// BOOST_NO_CHAR16_T should not be defined.
+// BOOST_NO_CXX11_CHAR16_T should not be defined.
// See file boost_no_char16_t.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_CHAR16_T
+#ifdef BOOST_NO_CXX11_CHAR16_T
#include "boost_no_char16_t.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_char16_t_pass.cpp b/test/no_char16_t_pass.cpp
index 45df2c8d..98735adc 100644
--- a/test/no_char16_t_pass.cpp
+++ b/test/no_char16_t_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_CHAR16_T
+// Test file for macro BOOST_NO_CXX11_CHAR16_T
// This file should compile, if it does not then
-// BOOST_NO_CHAR16_T should be defined.
+// BOOST_NO_CXX11_CHAR16_T should be defined.
// See file boost_no_char16_t.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_CHAR16_T
+#ifndef BOOST_NO_CXX11_CHAR16_T
#include "boost_no_char16_t.ipp"
#else
namespace boost_no_char16_t = empty_boost;
diff --git a/test/no_char32_t_fail.cpp b/test/no_char32_t_fail.cpp
index 53124a4d..4d3e8eb4 100644
--- a/test/no_char32_t_fail.cpp
+++ b/test/no_char32_t_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_CHAR32_T
+// Test file for macro BOOST_NO_CXX11_CHAR32_T
// This file should not compile, if it does then
-// BOOST_NO_CHAR32_T should not be defined.
+// BOOST_NO_CXX11_CHAR32_T should not be defined.
// See file boost_no_char32_t.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_CHAR32_T
+#ifdef BOOST_NO_CXX11_CHAR32_T
#include "boost_no_char32_t.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_char32_t_pass.cpp b/test/no_char32_t_pass.cpp
index 0abc220b..10dccbe6 100644
--- a/test/no_char32_t_pass.cpp
+++ b/test/no_char32_t_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_CHAR32_T
+// Test file for macro BOOST_NO_CXX11_CHAR32_T
// This file should compile, if it does not then
-// BOOST_NO_CHAR32_T should be defined.
+// BOOST_NO_CXX11_CHAR32_T should be defined.
// See file boost_no_char32_t.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_CHAR32_T
+#ifndef BOOST_NO_CXX11_CHAR32_T
#include "boost_no_char32_t.ipp"
#else
namespace boost_no_char32_t = empty_boost;
diff --git a/test/no_constexpr_fail.cpp b/test/no_constexpr_fail.cpp
index 9406f784..1d39ea40 100644
--- a/test/no_constexpr_fail.cpp
+++ b/test/no_constexpr_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_CONSTEXPR
+// Test file for macro BOOST_NO_CXX11_CONSTEXPR
// This file should not compile, if it does then
-// BOOST_NO_CONSTEXPR should not be defined.
+// BOOST_NO_CXX11_CONSTEXPR should not be defined.
// See file boost_no_constexpr.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_CONSTEXPR
+#ifdef BOOST_NO_CXX11_CONSTEXPR
#include "boost_no_constexpr.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_constexpr_pass.cpp b/test/no_constexpr_pass.cpp
index 2c86f4e1..b5be562c 100644
--- a/test/no_constexpr_pass.cpp
+++ b/test/no_constexpr_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_CONSTEXPR
+// Test file for macro BOOST_NO_CXX11_CONSTEXPR
// This file should compile, if it does not then
-// BOOST_NO_CONSTEXPR should be defined.
+// BOOST_NO_CXX11_CONSTEXPR should be defined.
// See file boost_no_constexpr.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_CONSTEXPR
+#ifndef BOOST_NO_CXX11_CONSTEXPR
#include "boost_no_constexpr.ipp"
#else
namespace boost_no_constexpr = empty_boost;
diff --git a/test/no_decltype_fail.cpp b/test/no_decltype_fail.cpp
index ab060488..6fbd3b97 100644
--- a/test/no_decltype_fail.cpp
+++ b/test/no_decltype_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_DECLTYPE
+// Test file for macro BOOST_NO_CXX11_DECLTYPE
// This file should not compile, if it does then
-// BOOST_NO_DECLTYPE should not be defined.
+// BOOST_NO_CXX11_DECLTYPE should not be defined.
// See file boost_no_decltype.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_DECLTYPE
+#ifdef BOOST_NO_CXX11_DECLTYPE
#include "boost_no_decltype.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_decltype_n3276_fail.cpp b/test/no_decltype_n3276_fail.cpp
index ab36e4b9..35a6d123 100644
--- a/test/no_decltype_n3276_fail.cpp
+++ b/test/no_decltype_n3276_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_DECLTYPE_N3276
+// Test file for macro BOOST_NO_CXX11_DECLTYPE_N3276
// This file should not compile, if it does then
-// BOOST_NO_DECLTYPE_N3276 should not be defined.
+// BOOST_NO_CXX11_DECLTYPE_N3276 should not be defined.
// See file boost_no_decltype_n3276.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_DECLTYPE_N3276
+#ifdef BOOST_NO_CXX11_DECLTYPE_N3276
#include "boost_no_decltype_n3276.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_decltype_n3276_pass.cpp b/test/no_decltype_n3276_pass.cpp
index 6c0ccea0..b1b8c0a6 100644
--- a/test/no_decltype_n3276_pass.cpp
+++ b/test/no_decltype_n3276_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_DECLTYPE_N3276
+// Test file for macro BOOST_NO_CXX11_DECLTYPE_N3276
// This file should compile, if it does not then
-// BOOST_NO_DECLTYPE_N3276 should be defined.
+// BOOST_NO_CXX11_DECLTYPE_N3276 should be defined.
// See file boost_no_decltype_n3276.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_DECLTYPE_N3276
+#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
#include "boost_no_decltype_n3276.ipp"
#else
namespace boost_no_decltype_n3276 = empty_boost;
diff --git a/test/no_decltype_pass.cpp b/test/no_decltype_pass.cpp
index a115419b..872c7b8f 100644
--- a/test/no_decltype_pass.cpp
+++ b/test/no_decltype_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_DECLTYPE
+// Test file for macro BOOST_NO_CXX11_DECLTYPE
// This file should compile, if it does not then
-// BOOST_NO_DECLTYPE should be defined.
+// BOOST_NO_CXX11_DECLTYPE should be defined.
// See file boost_no_decltype.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_DECLTYPE
+#ifndef BOOST_NO_CXX11_DECLTYPE
#include "boost_no_decltype.ipp"
#else
namespace boost_no_decltype = empty_boost;
diff --git a/test/no_defaulted_functions_fail.cpp b/test/no_defaulted_functions_fail.cpp
index eb681802..858dbe26 100644
--- a/test/no_defaulted_functions_fail.cpp
+++ b/test/no_defaulted_functions_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_DEFAULTED_FUNCTIONS
+// Test file for macro BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
// This file should not compile, if it does then
-// BOOST_NO_DEFAULTED_FUNCTIONS should not be defined.
+// BOOST_NO_CXX11_DEFAULTED_FUNCTIONS should not be defined.
// See file boost_no_defaulted_functions.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_DEFAULTED_FUNCTIONS
+#ifdef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
#include "boost_no_defaulted_functions.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_defaulted_functions_pass.cpp b/test/no_defaulted_functions_pass.cpp
index eae0c65d..3a3117c1 100644
--- a/test/no_defaulted_functions_pass.cpp
+++ b/test/no_defaulted_functions_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_DEFAULTED_FUNCTIONS
+// Test file for macro BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
// This file should compile, if it does not then
-// BOOST_NO_DEFAULTED_FUNCTIONS should be defined.
+// BOOST_NO_CXX11_DEFAULTED_FUNCTIONS should be defined.
// See file boost_no_defaulted_functions.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_DEFAULTED_FUNCTIONS
+#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
#include "boost_no_defaulted_functions.ipp"
#else
namespace boost_no_defaulted_functions = empty_boost;
diff --git a/test/no_deleted_functions_fail.cpp b/test/no_deleted_functions_fail.cpp
index 4d90d761..fa1687fa 100644
--- a/test/no_deleted_functions_fail.cpp
+++ b/test/no_deleted_functions_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_DELETED_FUNCTIONS
+// Test file for macro BOOST_NO_CXX11_DELETED_FUNCTIONS
// This file should not compile, if it does then
-// BOOST_NO_DELETED_FUNCTIONS should not be defined.
+// BOOST_NO_CXX11_DELETED_FUNCTIONS should not be defined.
// See file boost_no_deleted_functions.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_DELETED_FUNCTIONS
+#ifdef BOOST_NO_CXX11_DELETED_FUNCTIONS
#include "boost_no_deleted_functions.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_deleted_functions_pass.cpp b/test/no_deleted_functions_pass.cpp
index b9563250..2a7adea3 100644
--- a/test/no_deleted_functions_pass.cpp
+++ b/test/no_deleted_functions_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_DELETED_FUNCTIONS
+// Test file for macro BOOST_NO_CXX11_DELETED_FUNCTIONS
// This file should compile, if it does not then
-// BOOST_NO_DELETED_FUNCTIONS should be defined.
+// BOOST_NO_CXX11_DELETED_FUNCTIONS should be defined.
// See file boost_no_deleted_functions.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_DELETED_FUNCTIONS
+#ifndef BOOST_NO_CXX11_DELETED_FUNCTIONS
#include "boost_no_deleted_functions.ipp"
#else
namespace boost_no_deleted_functions = empty_boost;
diff --git a/test/no_explicit_cvt_ops_fail.cpp b/test/no_explicit_cvt_ops_fail.cpp
index a9e83183..405bb798 100644
--- a/test/no_explicit_cvt_ops_fail.cpp
+++ b/test/no_explicit_cvt_ops_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+// Test file for macro BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
// This file should not compile, if it does then
-// BOOST_NO_EXPLICIT_CONVERSION_OPERATORS should not be defined.
+// BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS should not be defined.
// See file boost_no_explicit_cvt_ops.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#ifdef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
#include "boost_no_explicit_cvt_ops.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_explicit_cvt_ops_pass.cpp b/test/no_explicit_cvt_ops_pass.cpp
index 91efc1ea..fde15fa8 100644
--- a/test/no_explicit_cvt_ops_pass.cpp
+++ b/test/no_explicit_cvt_ops_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+// Test file for macro BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
// This file should compile, if it does not then
-// BOOST_NO_EXPLICIT_CONVERSION_OPERATORS should be defined.
+// BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS should be defined.
// See file boost_no_explicit_cvt_ops.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#ifndef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
#include "boost_no_explicit_cvt_ops.ipp"
#else
namespace boost_no_explicit_conversion_operators = empty_boost;
diff --git a/test/no_extern_template_fail.cpp b/test/no_extern_template_fail.cpp
index 6e739c87..c5427302 100644
--- a/test/no_extern_template_fail.cpp
+++ b/test/no_extern_template_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_EXTERN_TEMPLATE
+// Test file for macro BOOST_NO_CXX11_EXTERN_TEMPLATE
// This file should not compile, if it does then
-// BOOST_NO_EXTERN_TEMPLATE should not be defined.
+// BOOST_NO_CXX11_EXTERN_TEMPLATE should not be defined.
// See file boost_no_extern_template.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_EXTERN_TEMPLATE
+#ifdef BOOST_NO_CXX11_EXTERN_TEMPLATE
#include "boost_no_extern_template.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_extern_template_pass.cpp b/test/no_extern_template_pass.cpp
index 60631a28..9d0354f4 100644
--- a/test/no_extern_template_pass.cpp
+++ b/test/no_extern_template_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_EXTERN_TEMPLATE
+// Test file for macro BOOST_NO_CXX11_EXTERN_TEMPLATE
// This file should compile, if it does not then
-// BOOST_NO_EXTERN_TEMPLATE should be defined.
+// BOOST_NO_CXX11_EXTERN_TEMPLATE should be defined.
// See file boost_no_extern_template.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_EXTERN_TEMPLATE
+#ifndef BOOST_NO_CXX11_EXTERN_TEMPLATE
#include "boost_no_extern_template.ipp"
#else
namespace boost_no_extern_template = empty_boost;
diff --git a/test/no_function_template_default_args_fail.cpp b/test/no_function_template_default_args_fail.cpp
index bff346d4..98ab7e13 100644
--- a/test/no_function_template_default_args_fail.cpp
+++ b/test/no_function_template_default_args_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+// Test file for macro BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
// This file should not compile, if it does then
-// BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS should not be defined.
+// BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS should not be defined.
// See file boost_no_function_template_default_args.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#ifdef BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
#include "boost_no_function_template_default_args.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_function_template_default_args_pass.cpp b/test/no_function_template_default_args_pass.cpp
index b6b27e6f..44d3804b 100644
--- a/test/no_function_template_default_args_pass.cpp
+++ b/test/no_function_template_default_args_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+// Test file for macro BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
// This file should compile, if it does not then
-// BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS should be defined.
+// BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS should be defined.
// See file boost_no_function_template_default_args.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+#ifndef BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
#include "boost_no_function_template_default_args.ipp"
#else
namespace boost_no_function_template_default_args = empty_boost;
diff --git a/test/no_lambdas_fail.cpp b/test/no_lambdas_fail.cpp
index 29adaca4..762d2968 100644
--- a/test/no_lambdas_fail.cpp
+++ b/test/no_lambdas_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_LAMBDAS
+// Test file for macro BOOST_NO_CXX11_LAMBDAS
// This file should not compile, if it does then
-// BOOST_NO_LAMBDAS should not be defined.
+// BOOST_NO_CXX11_LAMBDAS should not be defined.
// See file boost_no_lambdas.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_LAMBDAS
+#ifdef BOOST_NO_CXX11_LAMBDAS
#include "boost_no_lambdas.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_lambdas_pass.cpp b/test/no_lambdas_pass.cpp
index 7f08b380..531613fc 100644
--- a/test/no_lambdas_pass.cpp
+++ b/test/no_lambdas_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_LAMBDAS
+// Test file for macro BOOST_NO_CXX11_LAMBDAS
// This file should compile, if it does not then
-// BOOST_NO_LAMBDAS should be defined.
+// BOOST_NO_CXX11_LAMBDAS should be defined.
// See file boost_no_lambdas.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_LAMBDAS
+#ifndef BOOST_NO_CXX11_LAMBDAS
#include "boost_no_lambdas.ipp"
#else
namespace boost_no_lambdas = empty_boost;
diff --git a/test/no_noexcept_fail.cpp b/test/no_noexcept_fail.cpp
index f06f55df..dfc95e01 100644
--- a/test/no_noexcept_fail.cpp
+++ b/test/no_noexcept_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_NOEXCEPT
+// Test file for macro BOOST_NO_CXX11_NOEXCEPT
// This file should not compile, if it does then
-// BOOST_NO_NOEXCEPT should not be defined.
+// BOOST_NO_CXX11_NOEXCEPT should not be defined.
// See file boost_no_noexcept.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_NOEXCEPT
+#ifdef BOOST_NO_CXX11_NOEXCEPT
#include "boost_no_noexcept.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_noexcept_pass.cpp b/test/no_noexcept_pass.cpp
index 9d6a6cdf..3f923c92 100644
--- a/test/no_noexcept_pass.cpp
+++ b/test/no_noexcept_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_NOEXCEPT
+// Test file for macro BOOST_NO_CXX11_NOEXCEPT
// This file should compile, if it does not then
-// BOOST_NO_NOEXCEPT should be defined.
+// BOOST_NO_CXX11_NOEXCEPT should be defined.
// See file boost_no_noexcept.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_NOEXCEPT
+#ifndef BOOST_NO_CXX11_NOEXCEPT
#include "boost_no_noexcept.ipp"
#else
namespace boost_no_noexcept = empty_boost;
diff --git a/test/no_nullptr_fail.cpp b/test/no_nullptr_fail.cpp
index bdbfde9a..8daa9ce8 100644
--- a/test/no_nullptr_fail.cpp
+++ b/test/no_nullptr_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_NULLPTR
+// Test file for macro BOOST_NO_CXX11_NULLPTR
// This file should not compile, if it does then
-// BOOST_NO_NULLPTR should not be defined.
+// BOOST_NO_CXX11_NULLPTR should not be defined.
// See file boost_no_nullptr.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_NULLPTR
+#ifdef BOOST_NO_CXX11_NULLPTR
#include "boost_no_nullptr.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_nullptr_pass.cpp b/test/no_nullptr_pass.cpp
index 7a5d2c5f..d2380f42 100644
--- a/test/no_nullptr_pass.cpp
+++ b/test/no_nullptr_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_NULLPTR
+// Test file for macro BOOST_NO_CXX11_NULLPTR
// This file should compile, if it does not then
-// BOOST_NO_NULLPTR should be defined.
+// BOOST_NO_CXX11_NULLPTR should be defined.
// See file boost_no_nullptr.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_NULLPTR
+#ifndef BOOST_NO_CXX11_NULLPTR
#include "boost_no_nullptr.ipp"
#else
namespace boost_no_nullptr = empty_boost;
diff --git a/test/no_raw_literals_fail.cpp b/test/no_raw_literals_fail.cpp
index 48ed107b..294bcfd7 100644
--- a/test/no_raw_literals_fail.cpp
+++ b/test/no_raw_literals_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_RAW_LITERALS
+// Test file for macro BOOST_NO_CXX11_RAW_LITERALS
// This file should not compile, if it does then
-// BOOST_NO_RAW_LITERALS should not be defined.
+// BOOST_NO_CXX11_RAW_LITERALS should not be defined.
// See file boost_no_raw_literals.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_RAW_LITERALS
+#ifdef BOOST_NO_CXX11_RAW_LITERALS
#include "boost_no_raw_literals.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_raw_literals_pass.cpp b/test/no_raw_literals_pass.cpp
index 725b6c15..0fea9d5f 100644
--- a/test/no_raw_literals_pass.cpp
+++ b/test/no_raw_literals_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_RAW_LITERALS
+// Test file for macro BOOST_NO_CXX11_RAW_LITERALS
// This file should compile, if it does not then
-// BOOST_NO_RAW_LITERALS should be defined.
+// BOOST_NO_CXX11_RAW_LITERALS should be defined.
// See file boost_no_raw_literals.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_RAW_LITERALS
+#ifndef BOOST_NO_CXX11_RAW_LITERALS
#include "boost_no_raw_literals.ipp"
#else
namespace boost_no_raw_literals = empty_boost;
diff --git a/test/no_rvalue_references_fail.cpp b/test/no_rvalue_references_fail.cpp
index 157c7efa..ca283f3e 100644
--- a/test/no_rvalue_references_fail.cpp
+++ b/test/no_rvalue_references_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_RVALUE_REFERENCES
+// Test file for macro BOOST_NO_CXX11_RVALUE_REFERENCES
// This file should not compile, if it does then
-// BOOST_NO_RVALUE_REFERENCES should not be defined.
+// BOOST_NO_CXX11_RVALUE_REFERENCES should not be defined.
// See file boost_no_rvalue_references.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_RVALUE_REFERENCES
+#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
#include "boost_no_rvalue_references.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_rvalue_references_pass.cpp b/test/no_rvalue_references_pass.cpp
index 1349ec81..c253c342 100644
--- a/test/no_rvalue_references_pass.cpp
+++ b/test/no_rvalue_references_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_RVALUE_REFERENCES
+// Test file for macro BOOST_NO_CXX11_RVALUE_REFERENCES
// This file should compile, if it does not then
-// BOOST_NO_RVALUE_REFERENCES should be defined.
+// BOOST_NO_CXX11_RVALUE_REFERENCES should be defined.
// See file boost_no_rvalue_references.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
#include "boost_no_rvalue_references.ipp"
#else
namespace boost_no_rvalue_references = empty_boost;
diff --git a/test/no_scoped_enums_fail.cpp b/test/no_scoped_enums_fail.cpp
index 1da2360c..a02eb1e8 100644
--- a/test/no_scoped_enums_fail.cpp
+++ b/test/no_scoped_enums_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_SCOPED_ENUMS
+// Test file for macro BOOST_NO_CXX11_SCOPED_ENUMS
// This file should not compile, if it does then
-// BOOST_NO_SCOPED_ENUMS should not be defined.
+// BOOST_NO_CXX11_SCOPED_ENUMS should not be defined.
// See file boost_no_scoped_enums.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_SCOPED_ENUMS
+#ifdef BOOST_NO_CXX11_SCOPED_ENUMS
#include "boost_no_scoped_enums.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_scoped_enums_pass.cpp b/test/no_scoped_enums_pass.cpp
index b462340d..64e9d346 100644
--- a/test/no_scoped_enums_pass.cpp
+++ b/test/no_scoped_enums_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_SCOPED_ENUMS
+// Test file for macro BOOST_NO_CXX11_SCOPED_ENUMS
// This file should compile, if it does not then
-// BOOST_NO_SCOPED_ENUMS should be defined.
+// BOOST_NO_CXX11_SCOPED_ENUMS should be defined.
// See file boost_no_scoped_enums.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_SCOPED_ENUMS
+#ifndef BOOST_NO_CXX11_SCOPED_ENUMS
#include "boost_no_scoped_enums.ipp"
#else
namespace boost_no_scoped_enums = empty_boost;
diff --git a/test/no_static_assert_fail.cpp b/test/no_static_assert_fail.cpp
index ba053413..5ae5e809 100644
--- a/test/no_static_assert_fail.cpp
+++ b/test/no_static_assert_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_STATIC_ASSERT
+// Test file for macro BOOST_NO_CXX11_STATIC_ASSERT
// This file should not compile, if it does then
-// BOOST_NO_STATIC_ASSERT should not be defined.
+// BOOST_NO_CXX11_STATIC_ASSERT should not be defined.
// See file boost_no_static_assert.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_STATIC_ASSERT
+#ifdef BOOST_NO_CXX11_STATIC_ASSERT
#include "boost_no_static_assert.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_static_assert_pass.cpp b/test/no_static_assert_pass.cpp
index 9df618a1..fbc50593 100644
--- a/test/no_static_assert_pass.cpp
+++ b/test/no_static_assert_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_STATIC_ASSERT
+// Test file for macro BOOST_NO_CXX11_STATIC_ASSERT
// This file should compile, if it does not then
-// BOOST_NO_STATIC_ASSERT should be defined.
+// BOOST_NO_CXX11_STATIC_ASSERT should be defined.
// See file boost_no_static_assert.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_STATIC_ASSERT
+#ifndef BOOST_NO_CXX11_STATIC_ASSERT
#include "boost_no_static_assert.ipp"
#else
namespace boost_no_static_assert = empty_boost;
diff --git a/test/no_tem_local_classes_fail.cpp b/test/no_tem_local_classes_fail.cpp
index 7f24b6ec..b9ac5ae6 100644
--- a/test/no_tem_local_classes_fail.cpp
+++ b/test/no_tem_local_classes_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
+// Test file for macro BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
// This file should not compile, if it does then
-// BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS should not be defined.
+// BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS should not be defined.
// See file boost_no_tem_local_classes.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#ifdef BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
#include "boost_no_tem_local_classes.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_tem_local_classes_pass.cpp b/test/no_tem_local_classes_pass.cpp
index 1dcbf59d..140bd6be 100644
--- a/test/no_tem_local_classes_pass.cpp
+++ b/test/no_tem_local_classes_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
+// Test file for macro BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
// This file should compile, if it does not then
-// BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS should be defined.
+// BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS should be defined.
// See file boost_no_tem_local_classes.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS
+#ifndef BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
#include "boost_no_tem_local_classes.ipp"
#else
namespace boost_no_local_class_template_parameters = empty_boost;
diff --git a/test/no_template_aliases_fail.cpp b/test/no_template_aliases_fail.cpp
index 8bda5eb9..cb4cabd6 100644
--- a/test/no_template_aliases_fail.cpp
+++ b/test/no_template_aliases_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_TEMPLATE_ALIASES
+// Test file for macro BOOST_NO_CXX11_TEMPLATE_ALIASES
// This file should not compile, if it does then
-// BOOST_NO_TEMPLATE_ALIASES should not be defined.
+// BOOST_NO_CXX11_TEMPLATE_ALIASES should not be defined.
// See file boost_no_template_aliases.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_TEMPLATE_ALIASES
+#ifdef BOOST_NO_CXX11_TEMPLATE_ALIASES
#include "boost_no_template_aliases.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_template_aliases_pass.cpp b/test/no_template_aliases_pass.cpp
index 2ff5dd38..570b7238 100644
--- a/test/no_template_aliases_pass.cpp
+++ b/test/no_template_aliases_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_TEMPLATE_ALIASES
+// Test file for macro BOOST_NO_CXX11_TEMPLATE_ALIASES
// This file should compile, if it does not then
-// BOOST_NO_TEMPLATE_ALIASES should be defined.
+// BOOST_NO_CXX11_TEMPLATE_ALIASES should be defined.
// See file boost_no_template_aliases.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_TEMPLATE_ALIASES
+#ifndef BOOST_NO_CXX11_TEMPLATE_ALIASES
#include "boost_no_template_aliases.ipp"
#else
namespace boost_no_template_aliases = empty_boost;
diff --git a/test/no_unicode_literals_fail.cpp b/test/no_unicode_literals_fail.cpp
index 0a1d32de..57d7e3f8 100644
--- a/test/no_unicode_literals_fail.cpp
+++ b/test/no_unicode_literals_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_UNICODE_LITERALS
+// Test file for macro BOOST_NO_CXX11_UNICODE_LITERALS
// This file should not compile, if it does then
-// BOOST_NO_UNICODE_LITERALS should not be defined.
+// BOOST_NO_CXX11_UNICODE_LITERALS should not be defined.
// See file boost_no_unicode_literals.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_UNICODE_LITERALS
+#ifdef BOOST_NO_CXX11_UNICODE_LITERALS
#include "boost_no_unicode_literals.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_unicode_literals_pass.cpp b/test/no_unicode_literals_pass.cpp
index cca64a16..88e73126 100644
--- a/test/no_unicode_literals_pass.cpp
+++ b/test/no_unicode_literals_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_UNICODE_LITERALS
+// Test file for macro BOOST_NO_CXX11_UNICODE_LITERALS
// This file should compile, if it does not then
-// BOOST_NO_UNICODE_LITERALS should be defined.
+// BOOST_NO_CXX11_UNICODE_LITERALS should be defined.
// See file boost_no_unicode_literals.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_UNICODE_LITERALS
+#ifndef BOOST_NO_CXX11_UNICODE_LITERALS
#include "boost_no_unicode_literals.ipp"
#else
namespace boost_no_unicode_literals = empty_boost;
diff --git a/test/no_unified_init_fail.cpp b/test/no_unified_init_fail.cpp
index 1cd6296f..cc92327b 100644
--- a/test/no_unified_init_fail.cpp
+++ b/test/no_unified_init_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+// Test file for macro BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
// This file should not compile, if it does then
-// BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX should not be defined.
+// BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX should not be defined.
// See file boost_no_unified_init.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#ifdef BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#include "boost_no_unified_init.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_unified_init_pass.cpp b/test/no_unified_init_pass.cpp
index 108a4a50..facd0f3b 100644
--- a/test/no_unified_init_pass.cpp
+++ b/test/no_unified_init_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+// Test file for macro BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
// This file should compile, if it does not then
-// BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX should be defined.
+// BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX should be defined.
// See file boost_no_unified_init.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
+#ifndef BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#include "boost_no_unified_init.ipp"
#else
namespace boost_no_unified_initialization_syntax = empty_boost;
diff --git a/test/no_variadic_macros_fail.cpp b/test/no_variadic_macros_fail.cpp
index e1195469..f92c1454 100644
--- a/test/no_variadic_macros_fail.cpp
+++ b/test/no_variadic_macros_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_VARIADIC_MACROS
+// Test file for macro BOOST_NO_CXX11_VARIADIC_MACROS
// This file should not compile, if it does then
-// BOOST_NO_VARIADIC_MACROS should not be defined.
+// BOOST_NO_CXX11_VARIADIC_MACROS should not be defined.
// See file boost_no_variadic_macros.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_VARIADIC_MACROS
+#ifdef BOOST_NO_CXX11_VARIADIC_MACROS
#include "boost_no_variadic_macros.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_variadic_macros_pass.cpp b/test/no_variadic_macros_pass.cpp
index 7475c4fa..d1624eb8 100644
--- a/test/no_variadic_macros_pass.cpp
+++ b/test/no_variadic_macros_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_VARIADIC_MACROS
+// Test file for macro BOOST_NO_CXX11_VARIADIC_MACROS
// This file should compile, if it does not then
-// BOOST_NO_VARIADIC_MACROS should be defined.
+// BOOST_NO_CXX11_VARIADIC_MACROS should be defined.
// See file boost_no_variadic_macros.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_VARIADIC_MACROS
+#ifndef BOOST_NO_CXX11_VARIADIC_MACROS
#include "boost_no_variadic_macros.ipp"
#else
namespace boost_no_variadic_macros = empty_boost;
diff --git a/test/no_variadic_templates_fail.cpp b/test/no_variadic_templates_fail.cpp
index 25f4eaf1..23bf1c3a 100644
--- a/test/no_variadic_templates_fail.cpp
+++ b/test/no_variadic_templates_fail.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_VARIADIC_TEMPLATES
+// Test file for macro BOOST_NO_CXX11_VARIADIC_TEMPLATES
// This file should not compile, if it does then
-// BOOST_NO_VARIADIC_TEMPLATES should not be defined.
+// BOOST_NO_CXX11_VARIADIC_TEMPLATES should not be defined.
// See file boost_no_variadic_templates.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#include "boost_no_variadic_templates.ipp"
#else
#error "this file should not compile"
diff --git a/test/no_variadic_templates_pass.cpp b/test/no_variadic_templates_pass.cpp
index 9f57e151..7ba08850 100644
--- a/test/no_variadic_templates_pass.cpp
+++ b/test/no_variadic_templates_pass.cpp
@@ -10,9 +10,9 @@
//
-// Test file for macro BOOST_NO_VARIADIC_TEMPLATES
+// Test file for macro BOOST_NO_CXX11_VARIADIC_TEMPLATES
// This file should compile, if it does not then
-// BOOST_NO_VARIADIC_TEMPLATES should be defined.
+// BOOST_NO_CXX11_VARIADIC_TEMPLATES should be defined.
// See file boost_no_variadic_templates.ipp for details
// Must not have BOOST_ASSERT_CONFIG set; it defeats
@@ -24,7 +24,7 @@
#include
#include "test.hpp"
-#ifndef BOOST_NO_VARIADIC_TEMPLATES
+#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#include "boost_no_variadic_templates.ipp"
#else
namespace boost_no_variadic_templates = empty_boost;