feedc0de/boost_config
1
0
Fork 0
forked from boostorg/config
Code Pull Requests Activity

Merge pull request #291 from boostorg/develop

Browse Source 
Merge for 1.71 release.
This commit is contained in:
jzmaddock
2019-07-02 11:47:12 +01:00
committed by GitHub
parent 92ea5a3bd9 f7b608155b
commit bbda3f0aba
11 changed files with 184 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
.travis.yml
View File

@ -6,6 +6,8 @@ language: cpp
sudo: false
dist : xenial
branches:
only:
- master
@ -26,6 +28,7 @@ matrix:
env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11
- os: linux
dist: trusty
compiler: g++-4.4
env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98,0x
addons:
@ -36,6 +39,7 @@ matrix:
- ubuntu-toolchain-r-test
- os: linux
dist: trusty
compiler: g++-4.6
env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x
addons:
@ -46,6 +50,7 @@ matrix:
- ubuntu-toolchain-r-test
- os: linux
dist: trusty
env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11
addons:
apt:
@ -55,6 +60,7 @@ matrix:
- ubuntu-toolchain-r-test
- os: linux
dist: trusty
env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=03,11
addons:
apt:
@ -64,6 +70,7 @@ matrix:
- ubuntu-toolchain-r-test
- os: linux
dist: trusty
env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11
addons:
apt:
@ -117,10 +124,22 @@ matrix:
sources:
- ubuntu-toolchain-r-test
- os: linux
dist: trusty
compiler: g++-9
env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17,2a
addons:
apt:
packages:
- g++-9
sources:
- ubuntu-toolchain-r-test
- os: linux
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11
- os: linux
dist: trusty
env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11,14,1z
addons:
apt:
@ -131,6 +150,7 @@ matrix:
- llvm-toolchain-precise-3.5
- os: linux
dist: trusty
env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11,14,1z
addons:
apt:
@ -141,6 +161,7 @@ matrix:
- llvm-toolchain-precise-3.6
- os: linux
dist: trusty
env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z
addons:
apt:
@ -151,6 +172,7 @@ matrix:
- llvm-toolchain-precise-3.7
- os: linux
dist: trusty
env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z
addons:
apt:
@ -161,6 +183,7 @@ matrix:
- llvm-toolchain-precise-3.8
- os: linux
dist: trusty
env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z
addons:
apt:
@ -179,7 +202,7 @@ matrix:
- clang-4.0
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-4.0
- llvm-toolchain-xenial-4.0
- os: linux
compiler: clang++-5.0
@ -190,11 +213,11 @@ matrix:
- clang-5.0
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-5.0
- llvm-toolchain-xenial-5.0
- os: linux
compiler: clang++-libc++
env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z
env: TOOLSET=clang COMPILER="clang++-5.0 -stdlib=libc++" CXXSTD=03,11,14
addons:
apt:
packages:
@ -202,7 +225,7 @@ matrix:
- clang-5.0
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-5.0
- llvm-toolchain-xenial-5.0
- os: linux
compiler: clang++-6.0
@ -213,7 +236,7 @@ matrix:
- clang-6.0
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-6.0
- llvm-toolchain-xenial-6.0
- os: linux
compiler: clang++-libc++
@ -225,11 +248,37 @@ matrix:
- libc++-dev
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-6.0
- llvm-toolchain-xenial-6.0
- os: linux
compiler: clang++-7
env: TOOLSET=clang COMPILER=clang++-7 CXXSTD=03,11,14,1z
addons:
apt:
packages:
- clang-7
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-xenial-7
- os: linux
compiler: clang++-8
env: TOOLSET=clang COMPILER=clang++-8 CXXSTD=03,11,14,17,2a
addons:
apt:
packages:
- clang-8
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-xenial-8
- os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,17,2a
osx_image: xcode10.2
- os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
osx_image: xcode9.1
osx_image: xcode9.4
- os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
@ -271,9 +320,7 @@ script:
- if [ $TEST_INTEL ]; then source ~/.bashrc; fi
- |-
echo "using $TOOLSET : : $COMPILER : <cxxflags>$EXTRA_FLAGS <linkflags>$EXTRA_FLAGS ;" > ~/user-config.jam
- IFS=','
- for CXXLOCAL in $CXXSTD; do (cd libs/config/test && ../../../b2 config_info_travis_install toolset=$TOOLSET cxxstd=$CXXLOCAL $CXXSTD_DIALECT && echo With Standard Version $CXXLOCAL && ./config_info_travis && rm ./config_info_travis) done
- unset IFS
- ./b2 libs/config/test//print_config_info toolset=$TOOLSET cxxstd=$CXXSTD $CXXSTD_DIALECT
- ./b2 -j3 libs/config/test toolset=$TOOLSET cxxstd=$CXXSTD $CXXSTD_DIALECT
notifications:

12
appveyor.bat
View File

@ -1,12 +0,0 @@
IF NOT DEFINED CXXSTD (
ECHO %ARGS:"=%
..\..\..\b2 config_info_travis_install %ARGS:"=%
config_info_travis
del config_info_travis.exe
)
IF DEFINED CXXSTD FOR %%A IN (%CXXSTD%) DO (
ECHO %ARGS:"=%
..\..\..\b2 -a -d2 config_info_travis_install %ARGS:"=% cxxstd=%%A
config_info_travis
del config_info_travis.exe
)

6
appveyor.yml
View File

@ -22,6 +22,10 @@ environment:
ARGS: --toolset=msvc-14.1 address-model=32
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
ARGS: --toolset=msvc-14.1 address-model=64 cxxflags=-std:c++latest cxxflags=-permissive-
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
ARGS: --toolset=clang-win address-model=64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
ARGS: --toolset=clang-win address-model=32
- ARGS: --toolset=msvc-9.0 address-model=32
- ARGS: --toolset=msvc-10.0 address-model=32
- ARGS: --toolset=msvc-11.0 address-model=32
@ -65,5 +69,5 @@ build: off
test_script:
- cd libs\config\test
- ..\appveyor.bat
- ..\..\..\b2 print_config_info %ARGS% cxxstd=%CXXSTD%
- ..\..\..\b2 -j3 %ARGS% cxxstd=%CXXSTD%

1
checks/architecture/Jamroot.jam
View File

@ -22,3 +22,4 @@ obj power : power.cpp ;
obj riscv : riscv.cpp ;
obj sparc : sparc.cpp ;
obj x86 : x86.cpp ;
obj s390x : s390x.cpp ;

11
checks/architecture/s390x.cpp Normal file
View File

@ -0,0 +1,11 @@
// s390x.cpp
//
// Copyright (c) 2012 Steven Watanabe
//
// Distributed under 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)
#if !defined(__s390x__)
#error "Not S390x"
#endif

8
include/boost/config/auto_link.hpp
View File

@ -99,7 +99,8 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
#if defined(BOOST_MSVC) \
|| defined(__BORLANDC__) \
|| (defined(__MWERKS__) && defined(_WIN32) && (__MWERKS__ >= 0x3000)) \
|| (defined(__ICL) && defined(_MSC_EXTENSIONS) && (_MSC_VER >= 1200))
|| (defined(__ICL) && defined(_MSC_EXTENSIONS) && (_MSC_VER >= 1200)) \
|| (defined(BOOST_CLANG) && defined(BOOST_WINDOWS) && defined(_MSC_VER) && (__clang_major__ >= 4))
#ifndef BOOST_VERSION_HPP
# include <boost/version.hpp>
@ -203,6 +204,11 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
// Metrowerks CodeWarrior 9.x
# define BOOST_LIB_TOOLSET "cw9"
# elif defined(BOOST_CLANG) && defined(BOOST_WINDOWS) && defined(_MSC_VER) && (__clang_major__ >= 4)
// Clang on Windows
# define BOOST_LIB_TOOLSET "clangw" BOOST_STRINGIZE(__clang_major__)
# endif
#endif // BOOST_LIB_TOOLSET

2
include/boost/config/detail/suffix.hpp
View File

@ -999,7 +999,7 @@ namespace std{ using ::type_info; }
#if __has_cpp_attribute(nodiscard)
# define BOOST_ATTRIBUTE_NODISCARD [[nodiscard]]
#endif
#if __has_cpp_attribute(no_unique_address)
#if __has_cpp_attribute(no_unique_address) && !(defined(__GNUC__) && (__cplusplus < 201100))
# define BOOST_ATTRIBUTE_NO_UNIQUE_ADDRESS [[no_unique_address]]
#endif
#endif

22
test/Jamfile.v2
View File

@ -8,6 +8,7 @@
# the template defined in options_v2.jam.
#
import feature ;
import testing ;
project
@ -114,7 +115,26 @@ obj has_clang_implicit_fallthrough : cmd_line_check.cpp :
explicit has_clang_implicit_fallthrough ;
exe config_info_printer : config_info.cpp ;
explicit config_info_printer ;
actions print-run
{
echo With Standard Version $(STANDARD:E=default)
echo =====================================================================
$(>)
}
rule print-run ( target : sources * : properties * )
{
STANDARD on $(target) = [ feature.get-values <cxxstd> : $(properties) ] ;
}
notfile print_config_info : @print-run : config_info_printer ;
explicit print_config_info ;
# Backwards compatibility:
exe config_info_travis : config_info.cpp ;
install config_info_travis_install : config_info_travis : <location>. ;
explicit config_info_travis_install ;
explicit config_info_travis ;

12
test/boost_no_cxx11_hdr_atomic.ipp
View File

@ -21,11 +21,17 @@
namespace boost_no_cxx11_hdr_atomic {
void consume(std::memory_order)
{}
int test()
{
std::memory_order m = static_cast<std::memory_order>(std::memory_order_relaxed | std::memory_order_consume | std::memory_order_acquire | std::memory_order_release
| std::memory_order_acq_rel | std::memory_order_seq_cst);
(void)m;
consume(std::memory_order_relaxed);
consume(std::memory_order_consume);
consume(std::memory_order_acquire);
consume(std::memory_order_release);
consume(std::memory_order_acq_rel);
consume(std::memory_order_seq_cst);
std::atomic<int> a1;
std::atomic<unsigned> a2;

2
test/boost_no_unicode_literals.ipp
View File

@ -17,7 +17,7 @@ void quiet_warning(const CharT*){}
int test()
{
#ifdef _<>_<EFBFBD>cpp_<EFBFBD>char8_<EFBFBD>t
#if defined(__cpp_char8_type) || defined(__cpp_char8_t)
// The change to char8_t in C++20 is a breaking change to the std:
const char8_t* c8 = u8"";
#else

33
test/config_info.cpp
View File

@ -1231,25 +1231,6 @@ void print_boost_macros()
PRINT_MACRO(BOOST_NO_USING_TEMPLATE);
PRINT_MACRO(BOOST_NO_VOID_RETURNS);
// END GENERATED BLOCK
PRINT_MACRO(BOOST_INTEL);
@ -1267,12 +1248,26 @@ void print_boost_macros()
PRINT_MACRO(BOOST_FALLTHROUGH);
PRINT_MACRO(BOOST_MAY_ALIAS);
PRINT_MACRO(BOOST_NO_MAY_ALIAS);
PRINT_MACRO(BOOST_ATTRIBUTE_NO_UNIQUE_ADDRESS);
PRINT_MACRO(BOOST_ATTRIBUTE_UNUSED);
PRINT_MACRO(BOOST_UNLIKELY);
PRINT_MACRO(BOOST_NORETURN);
}
void print_sd6_macros()
{
// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0096r5.html
// C++20:
PRINT_MACRO(__cpp_aggregate_paren_init);
PRINT_MACRO(__cpp_char8_t);
PRINT_MACRO(__cpp_char8_type);
PRINT_MACRO(__cpp_conditional_explicit);
PRINT_MACRO(__cpp_coroutines);
PRINT_MACRO(__cpp_impl_destroying_delete);
PRINT_MACRO(__cpp_impl_three_way_comparison);
PRINT_MACRO(__cpp_nontype_template_parameter_class);
// C++17:
PRINT_MACRO(__cpp_hex_float);
PRINT_MACRO(__cpp_inline_variables);