mirror of
https://github.com/boostorg/config.git
synced 2025-07-30 20:37:15 +02:00
Merge branch 'final' of https://github.com/K-ballo/config into develop
This commit is contained in:
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# *** DO NOT EDIT THIS FILE BY HAND ***
|
# *** DO NOT EDIT THIS FILE BY HAND ***
|
||||||
# This file was automatically generated on Thu Jun 12 13:21:03 2014
|
# This file was automatically generated on Fri Aug 15 15:51:00 2014
|
||||||
# by libs/config/tools/generate.cpp
|
# by libs/config/tools/generate.cpp
|
||||||
# Copyright John Maddock.
|
# Copyright John Maddock.
|
||||||
# Use, modification and distribution are subject to the
|
# Use, modification and distribution are subject to the
|
||||||
@ -242,6 +242,9 @@ explicit cxx11_allocator ;
|
|||||||
run-simple test_case.cpp : : : <define>TEST_BOOST_NO_CXX11_ATOMIC_SMART_PTR : cxx11_atomic_smart_ptr ;
|
run-simple test_case.cpp : : : <define>TEST_BOOST_NO_CXX11_ATOMIC_SMART_PTR : cxx11_atomic_smart_ptr ;
|
||||||
alias cxx11_atomic_smart_ptr : cxx11_atomic_smart_ptr.output ;
|
alias cxx11_atomic_smart_ptr : cxx11_atomic_smart_ptr.output ;
|
||||||
explicit cxx11_atomic_smart_ptr ;
|
explicit cxx11_atomic_smart_ptr ;
|
||||||
|
run-simple test_case.cpp : : : <define>TEST_BOOST_NO_CXX11_FINAL : cxx11_final ;
|
||||||
|
alias cxx11_final : cxx11_final.output ;
|
||||||
|
explicit cxx11_final ;
|
||||||
run-simple test_case.cpp : : : <define>TEST_BOOST_NO_CXX11_HDR_ARRAY : cxx11_hdr_array ;
|
run-simple test_case.cpp : : : <define>TEST_BOOST_NO_CXX11_HDR_ARRAY : cxx11_hdr_array ;
|
||||||
alias cxx11_hdr_array : cxx11_hdr_array.output ;
|
alias cxx11_hdr_array : cxx11_hdr_array.output ;
|
||||||
explicit cxx11_hdr_array ;
|
explicit cxx11_hdr_array ;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
// This file was automatically generated on Thu Jun 12 13:21:03 2014
|
// This file was automatically generated on Fri Aug 15 15:51:00 2014
|
||||||
// by libs/config/tools/generate.cpp
|
// by libs/config/tools/generate.cpp
|
||||||
// Copyright John Maddock 2002-4.
|
// Copyright John Maddock 2002-4.
|
||||||
// Use, modification and distribution are subject to the
|
// Use, modification and distribution are subject to the
|
||||||
@ -297,6 +297,10 @@ namespace test = boost_no_cxx11_allocator;
|
|||||||
# include "../test/boost_no_cxx11_atomic_sp.ipp"
|
# include "../test/boost_no_cxx11_atomic_sp.ipp"
|
||||||
namespace test = boost_no_cxx11_atomic_smart_ptr;
|
namespace test = boost_no_cxx11_atomic_smart_ptr;
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef TEST_BOOST_NO_CXX11_FINAL
|
||||||
|
# include "../test/boost_no_cxx11_final.ipp"
|
||||||
|
namespace test = boost_no_cxx11_final;
|
||||||
|
#endif
|
||||||
#ifdef TEST_BOOST_NO_CXX11_HDR_ARRAY
|
#ifdef TEST_BOOST_NO_CXX11_HDR_ARRAY
|
||||||
# include "../test/boost_no_cxx11_hdr_array.ipp"
|
# include "../test/boost_no_cxx11_hdr_array.ipp"
|
||||||
namespace test = boost_no_cxx11_hdr_array;
|
namespace test = boost_no_cxx11_hdr_array;
|
||||||
|
@ -2863,6 +2863,18 @@
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
<td>
|
||||||
|
<p>
|
||||||
|
<code class="computeroutput"><span class="identifier">BOOST_NO_CXX11_FINAL</span></code>
|
||||||
|
</p>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<p>
|
||||||
|
The compiler does not support the C++ class-virt-specifier final.
|
||||||
|
</p>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<p>
|
<p>
|
||||||
<code class="computeroutput"><span class="identifier">BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS</span></code>
|
<code class="computeroutput"><span class="identifier">BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS</span></code>
|
||||||
|
@ -968,7 +968,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
|
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
|
||||||
<td align="left"><p><small>Last revised: June 12, 2014 at 12:31:43 GMT</small></p></td>
|
<td align="left"><p><small>Last revised: August 15, 2014 at 19:00:47 GMT</small></p></td>
|
||||||
<td align="right"><div class="copyright-footer"></div></td>
|
<td align="right"><div class="copyright-footer"></div></td>
|
||||||
</tr></table>
|
</tr></table>
|
||||||
<hr>
|
<hr>
|
||||||
|
@ -649,6 +649,8 @@ explicit conversion operators (`explicit operator T()`).
|
|||||||
[[`BOOST_NO_CXX11_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 ...`).
|
explicit instantiation forward declarations for templates (`extern template ...`).
|
||||||
]]
|
]]
|
||||||
|
[[`BOOST_NO_CXX11_FINAL`][The compiler does not support the C++ class-virt-specifier final.
|
||||||
|
]]
|
||||||
[[`BOOST_NO_CXX11_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.
|
default template arguments for function templates.
|
||||||
]]
|
]]
|
||||||
|
@ -218,6 +218,7 @@
|
|||||||
// C++0x features in 4.7.n and later
|
// C++0x features in 4.7.n and later
|
||||||
//
|
//
|
||||||
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
|
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
|
||||||
|
# define BOOST_NO_CXX11_FINAL
|
||||||
# define BOOST_NO_CXX11_TEMPLATE_ALIASES
|
# define BOOST_NO_CXX11_TEMPLATE_ALIASES
|
||||||
# define BOOST_NO_CXX11_USER_DEFINED_LITERALS
|
# define BOOST_NO_CXX11_USER_DEFINED_LITERALS
|
||||||
#endif
|
#endif
|
||||||
|
@ -152,6 +152,7 @@
|
|||||||
// C++11 features supported by VC++ 11 (aka 2012)
|
// C++11 features supported by VC++ 11 (aka 2012)
|
||||||
//
|
//
|
||||||
#if _MSC_VER < 1700
|
#if _MSC_VER < 1700
|
||||||
|
# define BOOST_NO_CXX11_FINAL
|
||||||
# define BOOST_NO_CXX11_RANGE_BASED_FOR
|
# define BOOST_NO_CXX11_RANGE_BASED_FOR
|
||||||
# define BOOST_NO_CXX11_SCOPED_ENUMS
|
# define BOOST_NO_CXX11_SCOPED_ENUMS
|
||||||
#endif // _MSC_VER < 1700
|
#endif // _MSC_VER < 1700
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# Regression test Jamfile for boost configuration setup.
|
# Regression test Jamfile for boost configuration setup.
|
||||||
# *** DO NOT EDIT THIS FILE BY HAND ***
|
# *** DO NOT EDIT THIS FILE BY HAND ***
|
||||||
# This file was automatically generated on Thu Jun 12 13:21:03 2014
|
# This file was automatically generated on Fri Aug 15 15:51:00 2014
|
||||||
# by libs/config/tools/generate.cpp
|
# by libs/config/tools/generate.cpp
|
||||||
# Copyright John Maddock.
|
# Copyright John Maddock.
|
||||||
# Use, modification and distribution are subject to the
|
# Use, modification and distribution are subject to the
|
||||||
@ -238,6 +238,9 @@ test-suite "BOOST_NO_CXX11_ALLOCATOR" :
|
|||||||
test-suite "BOOST_NO_CXX11_ATOMIC_SMART_PTR" :
|
test-suite "BOOST_NO_CXX11_ATOMIC_SMART_PTR" :
|
||||||
[ run ../no_cxx11_atomic_sp_pass.cpp ]
|
[ run ../no_cxx11_atomic_sp_pass.cpp ]
|
||||||
[ compile-fail ../no_cxx11_atomic_sp_fail.cpp ] ;
|
[ compile-fail ../no_cxx11_atomic_sp_fail.cpp ] ;
|
||||||
|
test-suite "BOOST_NO_CXX11_FINAL" :
|
||||||
|
[ run ../no_cxx11_final_pass.cpp ]
|
||||||
|
[ compile-fail ../no_cxx11_final_fail.cpp ] ;
|
||||||
test-suite "BOOST_NO_CXX11_HDR_ARRAY" :
|
test-suite "BOOST_NO_CXX11_HDR_ARRAY" :
|
||||||
[ run ../no_cxx11_hdr_array_pass.cpp ]
|
[ run ../no_cxx11_hdr_array_pass.cpp ]
|
||||||
[ compile-fail ../no_cxx11_hdr_array_fail.cpp ] ;
|
[ compile-fail ../no_cxx11_hdr_array_fail.cpp ] ;
|
||||||
|
22
test/boost_no_cxx11_final.ipp
Normal file
22
test/boost_no_cxx11_final.ipp
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
// (C) Copyright Agustin Berge 2014
|
||||||
|
|
||||||
|
// Use, modification and distribution are subject to the
|
||||||
|
// Boost Software License, Version 1.0. (See accompanying file
|
||||||
|
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||||
|
|
||||||
|
// See http://www.boost.org/libs/config for more information.
|
||||||
|
|
||||||
|
// MACRO: BOOST_NO_CXX11_FINAL
|
||||||
|
// TITLE: C++11 final class-virt-specifier
|
||||||
|
// DESCRIPTION: The compiler does not support the C++ class-virt-specifier final
|
||||||
|
|
||||||
|
namespace boost_no_cxx11_final {
|
||||||
|
|
||||||
|
struct X final {};
|
||||||
|
|
||||||
|
int test()
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -1010,6 +1010,7 @@ void print_boost_macros()
|
|||||||
PRINT_MACRO(BOOST_NO_CXX11_DELETED_FUNCTIONS);
|
PRINT_MACRO(BOOST_NO_CXX11_DELETED_FUNCTIONS);
|
||||||
PRINT_MACRO(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS);
|
PRINT_MACRO(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS);
|
||||||
PRINT_MACRO(BOOST_NO_CXX11_EXTERN_TEMPLATE);
|
PRINT_MACRO(BOOST_NO_CXX11_EXTERN_TEMPLATE);
|
||||||
|
PRINT_MACRO(BOOST_NO_CXX11_FINAL);
|
||||||
PRINT_MACRO(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS);
|
PRINT_MACRO(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS);
|
||||||
PRINT_MACRO(BOOST_NO_CXX11_HDR_ARRAY);
|
PRINT_MACRO(BOOST_NO_CXX11_HDR_ARRAY);
|
||||||
PRINT_MACRO(BOOST_NO_CXX11_HDR_ATOMIC);
|
PRINT_MACRO(BOOST_NO_CXX11_HDR_ATOMIC);
|
||||||
@ -1130,6 +1131,7 @@ void print_boost_macros()
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// END GENERATED BLOCK
|
// END GENERATED BLOCK
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
// This file was automatically generated on Thu Jun 12 13:21:03 2014
|
// This file was automatically generated on Fri Aug 15 15:51:00 2014
|
||||||
// by libs/config/tools/generate.cpp
|
// by libs/config/tools/generate.cpp
|
||||||
// Copyright John Maddock 2002-4.
|
// Copyright John Maddock 2002-4.
|
||||||
// Use, modification and distribution are subject to the
|
// Use, modification and distribution are subject to the
|
||||||
@ -122,6 +122,11 @@ namespace boost_no_cxx11_allocator = empty_boost;
|
|||||||
#else
|
#else
|
||||||
namespace boost_no_cxx11_atomic_smart_ptr = empty_boost;
|
namespace boost_no_cxx11_atomic_smart_ptr = empty_boost;
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef BOOST_NO_CXX11_FINAL
|
||||||
|
#include "boost_no_cxx11_final.ipp"
|
||||||
|
#else
|
||||||
|
namespace boost_no_cxx11_final = empty_boost;
|
||||||
|
#endif
|
||||||
#ifndef BOOST_NO_CXX11_HDR_ARRAY
|
#ifndef BOOST_NO_CXX11_HDR_ARRAY
|
||||||
#include "boost_no_cxx11_hdr_array.ipp"
|
#include "boost_no_cxx11_hdr_array.ipp"
|
||||||
#else
|
#else
|
||||||
@ -1286,6 +1291,11 @@ int main( int, char *[] )
|
|||||||
std::cerr << "Failed test for BOOST_NO_CXX11_ATOMIC_SMART_PTR at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
std::cerr << "Failed test for BOOST_NO_CXX11_ATOMIC_SMART_PTR at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||||
++error_count;
|
++error_count;
|
||||||
}
|
}
|
||||||
|
if(0 != boost_no_cxx11_final::test())
|
||||||
|
{
|
||||||
|
std::cerr << "Failed test for BOOST_NO_CXX11_FINAL at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||||
|
++error_count;
|
||||||
|
}
|
||||||
if(0 != boost_no_cxx11_hdr_array::test())
|
if(0 != boost_no_cxx11_hdr_array::test())
|
||||||
{
|
{
|
||||||
std::cerr << "Failed test for BOOST_NO_CXX11_HDR_ARRAY at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
std::cerr << "Failed test for BOOST_NO_CXX11_HDR_ARRAY at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||||
|
37
test/no_cxx11_final_fail.cpp
Normal file
37
test/no_cxx11_final_fail.cpp
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
// This file was automatically generated on Fri Aug 15 15:51:00 2014
|
||||||
|
// by libs/config/tools/generate.cpp
|
||||||
|
// Copyright John Maddock 2002-4.
|
||||||
|
// Use, modification and distribution are subject to the
|
||||||
|
// Boost Software License, Version 1.0. (See accompanying file
|
||||||
|
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||||
|
|
||||||
|
// See http://www.boost.org/libs/config for the most recent version.//
|
||||||
|
// Revision $Id$
|
||||||
|
//
|
||||||
|
|
||||||
|
|
||||||
|
// Test file for macro BOOST_NO_CXX11_FINAL
|
||||||
|
// This file should not compile, if it does then
|
||||||
|
// BOOST_NO_CXX11_FINAL should not be defined.
|
||||||
|
// See file boost_no_cxx11_final.ipp for details
|
||||||
|
|
||||||
|
// Must not have BOOST_ASSERT_CONFIG set; it defeats
|
||||||
|
// the objective of this file:
|
||||||
|
#ifdef BOOST_ASSERT_CONFIG
|
||||||
|
# undef BOOST_ASSERT_CONFIG
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <boost/config.hpp>
|
||||||
|
#include "test.hpp"
|
||||||
|
|
||||||
|
#ifdef BOOST_NO_CXX11_FINAL
|
||||||
|
#include "boost_no_cxx11_final.ipp"
|
||||||
|
#else
|
||||||
|
#error "this file should not compile"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int main( int, char *[] )
|
||||||
|
{
|
||||||
|
return boost_no_cxx11_final::test();
|
||||||
|
}
|
||||||
|
|
37
test/no_cxx11_final_pass.cpp
Normal file
37
test/no_cxx11_final_pass.cpp
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
// This file was automatically generated on Fri Aug 15 15:51:00 2014
|
||||||
|
// by libs/config/tools/generate.cpp
|
||||||
|
// Copyright John Maddock 2002-4.
|
||||||
|
// Use, modification and distribution are subject to the
|
||||||
|
// Boost Software License, Version 1.0. (See accompanying file
|
||||||
|
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||||
|
|
||||||
|
// See http://www.boost.org/libs/config for the most recent version.//
|
||||||
|
// Revision $Id$
|
||||||
|
//
|
||||||
|
|
||||||
|
|
||||||
|
// Test file for macro BOOST_NO_CXX11_FINAL
|
||||||
|
// This file should compile, if it does not then
|
||||||
|
// BOOST_NO_CXX11_FINAL should be defined.
|
||||||
|
// See file boost_no_cxx11_final.ipp for details
|
||||||
|
|
||||||
|
// Must not have BOOST_ASSERT_CONFIG set; it defeats
|
||||||
|
// the objective of this file:
|
||||||
|
#ifdef BOOST_ASSERT_CONFIG
|
||||||
|
# undef BOOST_ASSERT_CONFIG
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <boost/config.hpp>
|
||||||
|
#include "test.hpp"
|
||||||
|
|
||||||
|
#ifndef BOOST_NO_CXX11_FINAL
|
||||||
|
#include "boost_no_cxx11_final.ipp"
|
||||||
|
#else
|
||||||
|
namespace boost_no_cxx11_final = empty_boost;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int main( int, char *[] )
|
||||||
|
{
|
||||||
|
return boost_no_cxx11_final::test();
|
||||||
|
}
|
||||||
|
|
Reference in New Issue
Block a user