forked from boostorg/config
Merge changes from Trunk.
Adds new macros BOOST_NO_NOEXCEPT and BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX. Fixes #4867. Fixes #5571. [SVN r72217]
This commit is contained in:
+21
-1
@@ -1,4 +1,4 @@
|
||||
// This file was automatically generated on Tue Mar 15 12:25:21 2011
|
||||
// This file was automatically generated on Mon May 09 12:11:18 2011
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-4.
|
||||
// Use, modification and distribution are subject to the
|
||||
@@ -367,6 +367,11 @@ namespace boost_no_pointer_to_member_template_parameters = empty_boost;
|
||||
#else
|
||||
namespace boost_no_nested_friendship = empty_boost;
|
||||
#endif
|
||||
#ifndef BOOST_NO_NOEXCEPT
|
||||
#include "boost_no_noexcept.ipp"
|
||||
#else
|
||||
namespace boost_no_noexcept = empty_boost;
|
||||
#endif
|
||||
#ifndef BOOST_NO_NULLPTR
|
||||
#include "boost_no_nullptr.ipp"
|
||||
#else
|
||||
@@ -552,6 +557,11 @@ namespace boost_no_typename_with_ctor = empty_boost;
|
||||
#else
|
||||
namespace boost_no_unicode_literals = empty_boost;
|
||||
#endif
|
||||
#ifndef BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
|
||||
#include "boost_no_unified_init.ipp"
|
||||
#else
|
||||
namespace boost_no_unified_initialization_syntax = empty_boost;
|
||||
#endif
|
||||
#ifndef BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
|
||||
#include "boost_no_using_breaks_adl.ipp"
|
||||
#else
|
||||
@@ -1436,6 +1446,11 @@ int main( int, char *[] )
|
||||
std::cerr << "Failed test for BOOST_NO_NESTED_FRIENDSHIP at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
++error_count;
|
||||
}
|
||||
if(0 != boost_no_noexcept::test())
|
||||
{
|
||||
std::cerr << "Failed test for BOOST_NO_NOEXCEPT at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
++error_count;
|
||||
}
|
||||
if(0 != boost_no_nullptr::test())
|
||||
{
|
||||
std::cerr << "Failed test for BOOST_NO_NULLPTR at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
@@ -1621,6 +1636,11 @@ int main( int, char *[] )
|
||||
std::cerr << "Failed test for BOOST_NO_UNICODE_LITERALS at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
++error_count;
|
||||
}
|
||||
if(0 != boost_no_unified_initialization_syntax::test())
|
||||
{
|
||||
std::cerr << "Failed test for BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
++error_count;
|
||||
}
|
||||
if(0 != boost_function_scope_using_declaration_breaks_adl::test())
|
||||
{
|
||||
std::cerr << "Failed test for BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
|
||||
Reference in New Issue
Block a user