forked from boostorg/config
Merge branch 'boost_no_cxx11_sfinae_expr' of https://github.com/glenfe/config into pr114
# Fixed Conflicts: # checks/Jamfile.v2 # checks/test_case.cpp # test/all/Jamfile.v2 # test/config_test.cpp Also added some more documentation to tie together the various SFINAE macros. Regenerated the docs.
This commit is contained in:
+11
-1
@@ -1,4 +1,4 @@
|
||||
// This file was automatically generated on Sun Feb 5 18:12:09 2017
|
||||
// This file was automatically generated on Sun Feb 5 19:09:22 2017
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-4.
|
||||
// Use, modification and distribution are subject to the
|
||||
@@ -242,6 +242,11 @@ namespace boost_no_cxx11_numeric_limits = empty_boost;
|
||||
#else
|
||||
namespace boost_no_cxx11_ref_qualifiers = empty_boost;
|
||||
#endif
|
||||
#ifndef BOOST_NO_CXX11_SFINAE_EXPR
|
||||
#include "boost_no_cxx11_sfinae_expr.ipp"
|
||||
#else
|
||||
namespace boost_no_cxx11_sfinae_expr = empty_boost;
|
||||
#endif
|
||||
#ifndef BOOST_NO_CXX11_SMART_PTR
|
||||
#include "boost_no_cxx11_smart_ptr.ipp"
|
||||
#else
|
||||
@@ -1506,6 +1511,11 @@ int main( int, char *[] )
|
||||
std::cerr << "Failed test for BOOST_NO_CXX11_REF_QUALIFIERS at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
++error_count;
|
||||
}
|
||||
if(0 != boost_no_cxx11_sfinae_expr::test())
|
||||
{
|
||||
std::cerr << "Failed test for BOOST_NO_CXX11_SFINAE_EXPR at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
++error_count;
|
||||
}
|
||||
if(0 != boost_no_cxx11_smart_ptr::test())
|
||||
{
|
||||
std::cerr << "Failed test for BOOST_NO_CXX11_SMART_PTR at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
|
||||
Reference in New Issue
Block a user