forked from boostorg/config
Merge branch 'develop'
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
This commit is contained in:
1 parent
84f2fb19d1
commit
76f6cdc453
39 files changed
+446
-660
No files matched your search
+11
-1
@@ -1,4 +1,4 @@
|
||||
// This file was automatically generated on Thu Aug 13 16:32:12 2015
|
||||
// This file was automatically generated on Fri Jul 1 18:47:25 2016
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-4.
|
||||
// Use, modification and distribution are subject to the
|
||||
@@ -252,6 +252,11 @@ namespace boost_no_cxx11_smart_ptr = empty_boost;
|
||||
#else
|
||||
namespace boost_no_cxx11_std_align = empty_boost;
|
||||
#endif
|
||||
#ifndef BOOST_NO_CXX11_THREAD_LOCAL
|
||||
#include "boost_no_cxx11_thread_local.ipp"
|
||||
#else
|
||||
namespace boost_no_cxx11_thread_local = empty_boost;
|
||||
#endif
|
||||
#ifndef BOOST_NO_CXX11_TRAILING_RESULT_TYPES
|
||||
#include "boost_no_cxx11_trailing_result_types.ipp"
|
||||
#else
|
||||
@@ -1491,6 +1496,11 @@ int main( int, char *[] )
|
||||
std::cerr << "Failed test for BOOST_NO_CXX11_STD_ALIGN at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
++error_count;
|
||||
}
|
||||
if(0 != boost_no_cxx11_thread_local::test())
|
||||
{
|
||||
std::cerr << "Failed test for BOOST_NO_CXX11_THREAD_LOCAL at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
++error_count;
|
||||
}
|
||||
if(0 != boost_no_cxx11_trailing_result_types::test())
|
||||
{
|
||||
std::cerr << "Failed test for BOOST_NO_CXX11_TRAILING_RESULT_TYPES at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
|
||||
Reference in new issue
Block a user