Merge rework of C++11 config macros to release

[SVN r79537]
This commit is contained in:
Marshall Clow
2012-07-15 15:59:05 +00:00
parent 1b1589b54d
commit bc0114f7c8
115 changed files with 1200 additions and 908 deletions

View File

@@ -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 <boost/config.hpp>
#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;