mirror of
https://github.com/boostorg/config.git
synced 2026-03-07 14:24:10 +01:00
Compare commits
18 Commits
cpp23featu
...
mclow-patc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
61a676cbdc | ||
|
|
19701e05d4 | ||
|
|
504587b476 | ||
|
|
5734e160e0 | ||
|
|
b160041a1b | ||
|
|
601598f832 | ||
|
|
f68e9c6e8d | ||
|
|
b8e57320d6 | ||
|
|
d3b2997e91 | ||
|
|
dba21bbaa1 | ||
|
|
ccff36321f | ||
|
|
b35f77942d | ||
|
|
ce6e42df6f | ||
|
|
1d2698c1f6 | ||
|
|
a98574fc12 | ||
|
|
9c34fb6585 | ||
|
|
54afd34839 | ||
|
|
9f8fbf36a6 |
62
.github/workflows/ci.yml
vendored
62
.github/workflows/ci.yml
vendored
@@ -19,7 +19,7 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
compiler: [ g++-11, g++-12, clang++-14 ]
|
||||
compiler: [ g++-11, g++-12, g++-13 ]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
@@ -34,7 +34,7 @@ jobs:
|
||||
- name: Add repository
|
||||
run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
|
||||
- name: Install packages
|
||||
run: sudo apt install g++-11 g++-12 clang-14
|
||||
run: sudo apt install g++-11 g++-12 g++-13
|
||||
- name: Checkout main boost
|
||||
run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
|
||||
- name: Update Dependencies
|
||||
@@ -63,7 +63,7 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
compiler: [ clang++-11, clang++-12, clang++-13 ]
|
||||
compiler: [ clang++-15 ]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
@@ -78,7 +78,7 @@ jobs:
|
||||
- name: Add repository
|
||||
run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
|
||||
- name: Install packages
|
||||
run: sudo apt install clang-11 clang-12 clang-13
|
||||
run: sudo apt install clang-15
|
||||
- name: Checkout main boost
|
||||
run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
|
||||
- name: Update Dependencies
|
||||
@@ -146,6 +146,50 @@ jobs:
|
||||
- name: Test
|
||||
run: ../../../b2 toolset=$TOOLSET cxxstd=03,11,14,17,2a
|
||||
working-directory: ../boost-root/libs/config/test
|
||||
ubuntu-focal-clang:
|
||||
runs-on: ubuntu-20.04
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
compiler: [ clang++-11, clang++-12 ]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: '0'
|
||||
- uses: mstachniuk/ci-skip@v1
|
||||
with:
|
||||
commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE]'
|
||||
commit-filter-separator: ';'
|
||||
fail-fast: true
|
||||
- name: Set TOOLSET
|
||||
run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
|
||||
- name: Add repository
|
||||
run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
|
||||
- name: Install packages
|
||||
run: sudo apt install clang-11 clang-12
|
||||
- name: Checkout main boost
|
||||
run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
|
||||
- name: Update Dependencies
|
||||
run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits
|
||||
working-directory: ../boost-root
|
||||
- name: Copy files
|
||||
run: cp -r $GITHUB_WORKSPACE/* libs/config
|
||||
working-directory: ../boost-root
|
||||
- name: Bootstrap
|
||||
run: ./bootstrap.sh
|
||||
working-directory: ../boost-root
|
||||
- name: Generate headers
|
||||
run: ./b2 headers
|
||||
working-directory: ../boost-root
|
||||
- name: Generate user config
|
||||
run: 'echo "using $TOOLSET : : ${{ matrix.compiler }} ;" > ~/user-config.jam'
|
||||
working-directory: ../boost-root
|
||||
- name: Config info
|
||||
run: ../../../b2 print_config_info toolset=$TOOLSET cxxstd=03,11,14,17,2a
|
||||
working-directory: ../boost-root/libs/config/test
|
||||
- name: Test
|
||||
run: ../../../b2 toolset=$TOOLSET cxxstd=03,11,14,17,2a
|
||||
working-directory: ../boost-root/libs/config/test
|
||||
macos_11:
|
||||
runs-on: macos-11
|
||||
strategy:
|
||||
@@ -249,10 +293,10 @@ jobs:
|
||||
run: b2 headers
|
||||
working-directory: ../boost-root
|
||||
- name: Config info
|
||||
run: ..\..\..\b2 print_config_info cxxstd=14,17 address-model=64 toolset=msvc-14.0
|
||||
run: ..\..\..\b2 print_config_info cxxstd=14,latest address-model=64 toolset=msvc-14.0
|
||||
working-directory: ../boost-root/libs/config/test
|
||||
- name: Test
|
||||
run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17 toolset=msvc-14.0
|
||||
run: ..\..\..\b2 --hash address-model=64 cxxstd=14,latest toolset=msvc-14.0
|
||||
working-directory: ../boost-root/libs/config/test
|
||||
windows_msvc_14_2:
|
||||
runs-on: windows-2019
|
||||
@@ -287,10 +331,10 @@ jobs:
|
||||
run: b2 headers
|
||||
working-directory: ../boost-root
|
||||
- name: Config info
|
||||
run: ..\..\..\b2 print_config_info cxxstd=14,17,latest address-model=64 toolset=msvc-14.2
|
||||
run: ..\..\..\b2 print_config_info cxxstd=14,17,20,latest address-model=64 toolset=msvc-14.2
|
||||
working-directory: ../boost-root/libs/config/test
|
||||
- name: Test
|
||||
run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17,latest toolset=msvc-14.2
|
||||
run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17,20,latest toolset=msvc-14.2
|
||||
working-directory: ../boost-root/libs/config/test
|
||||
windows_msvc_14_3:
|
||||
runs-on: windows-2022
|
||||
@@ -325,7 +369,7 @@ jobs:
|
||||
run: b2 headers
|
||||
working-directory: ../boost-root
|
||||
- name: Config info
|
||||
run: ..\..\..\b2 print_config_info cxxstd=14,17,latest address-model=64 toolset=msvc-14.3
|
||||
run: ..\..\..\b2 print_config_info cxxstd=14,17,20,latest address-model=64 toolset=msvc-14.3
|
||||
working-directory: ../boost-root/libs/config/test
|
||||
- name: Test
|
||||
run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17,20,latest toolset=msvc-14.3
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# *** DO NOT EDIT THIS FILE BY HAND ***
|
||||
# This file was automatically generated on Fri Oct 13 19:09:38 2023
|
||||
# This file was automatically generated on Mon Jan 22 16:16:53 2024
|
||||
# by libs/config/tools/generate.cpp
|
||||
# Copyright John Maddock.
|
||||
# Use, modification and distribution are subject to the
|
||||
@@ -119,6 +119,7 @@ obj cxx14_return_type_deduction : test_case.cpp : <define>TEST_BOOST_NO_CXX14_RE
|
||||
obj cxx14_std_exchange : test_case.cpp : <define>TEST_BOOST_NO_CXX14_STD_EXCHANGE ;
|
||||
obj cxx14_variable_templates : test_case.cpp : <define>TEST_BOOST_NO_CXX14_VARIABLE_TEMPLATES ;
|
||||
obj cxx17 : test_case.cpp : <define>TEST_BOOST_NO_CXX17 ;
|
||||
obj cxx17_auto_nontype_template_params : test_case.cpp : <define>TEST_BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS ;
|
||||
obj cxx17_deduction_guides : test_case.cpp : <define>TEST_BOOST_NO_CXX17_DEDUCTION_GUIDES ;
|
||||
obj cxx17_fold_expressions : test_case.cpp : <define>TEST_BOOST_NO_CXX17_FOLD_EXPRESSIONS ;
|
||||
obj cxx17_hdr_any : test_case.cpp : <define>TEST_BOOST_NO_CXX17_HDR_ANY ;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// This file was automatically generated on Fri Oct 13 19:09:38 2023
|
||||
// This file was automatically generated on Mon Jan 22 16:16:53 2024
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-21.
|
||||
// Use, modification and distribution are subject to the
|
||||
@@ -551,6 +551,11 @@
|
||||
# error "Defect macro BOOST_NO_CXX17 is defined."
|
||||
# endif
|
||||
#endif
|
||||
#ifdef TEST_BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
# ifdef BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
# error "Defect macro BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS is defined."
|
||||
# endif
|
||||
#endif
|
||||
#ifdef TEST_BOOST_NO_CXX17_DEDUCTION_GUIDES
|
||||
# ifdef BOOST_NO_CXX17_DEDUCTION_GUIDES
|
||||
# error "Defect macro BOOST_NO_CXX17_DEDUCTION_GUIDES is defined."
|
||||
|
||||
@@ -1027,6 +1027,7 @@ that are not yet supported by a particular compiler or library.
|
||||
[[`BOOST_NO_CXX17_IF_CONSTEXPR`][The compiler does not support `if constexpr`.]]
|
||||
[[`BOOST_NO_CXX17_INLINE_VARIABLES`][The compiler does not support `inline` variables.]]
|
||||
[[`BOOST_NO_CXX17_DEDUCTION_GUIDES`][The compiler does not support class template argument deduction (CTAD) guides.]]
|
||||
[[`BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS`][The compiler does not support `auto` non-type template parameters.]]
|
||||
]
|
||||
|
||||
[endsect]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// This file was automatically generated on Fri Oct 13 19:09:38 2023
|
||||
// This file was automatically generated on Mon Jan 22 16:16:53 2024
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-21.
|
||||
// Use, modification and distribution are subject to the
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// This file was automatically generated on Fri Oct 13 19:09:38 2023
|
||||
// This file was automatically generated on Mon Jan 22 16:16:53 2024
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-21.
|
||||
// Use, modification and distribution are subject to the
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// This file was automatically generated on Fri Oct 13 19:09:38 2023
|
||||
// This file was automatically generated on Mon Jan 22 16:16:53 2024
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-21.
|
||||
// Use, modification and distribution are subject to the
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// This file was automatically generated on Fri Oct 13 19:09:38 2023
|
||||
// This file was automatically generated on Mon Jan 22 16:16:53 2024
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-21.
|
||||
// Use, modification and distribution are subject to the
|
||||
@@ -12,6 +12,9 @@
|
||||
#include <boost/config.hpp>
|
||||
#include <boost/config/assert_cxx14.hpp>
|
||||
|
||||
#ifdef BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
# error "Your compiler appears not to be fully C++17 compliant. Detected via defect macro BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS."
|
||||
#endif
|
||||
#ifdef BOOST_NO_CXX17_DEDUCTION_GUIDES
|
||||
# error "Your compiler appears not to be fully C++17 compliant. Detected via defect macro BOOST_NO_CXX17_DEDUCTION_GUIDES."
|
||||
#endif
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// This file was automatically generated on Fri Oct 13 19:09:38 2023
|
||||
// This file was automatically generated on Mon Jan 22 16:16:53 2024
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-21.
|
||||
// Use, modification and distribution are subject to the
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// This file was automatically generated on Fri Oct 13 19:09:38 2023
|
||||
// This file was automatically generated on Mon Jan 22 16:16:53 2024
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-21.
|
||||
// Use, modification and distribution are subject to the
|
||||
|
||||
@@ -245,6 +245,9 @@
|
||||
#if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
|
||||
# define BOOST_NO_CXX17_IF_CONSTEXPR
|
||||
#endif
|
||||
#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
|
||||
# define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#endif
|
||||
|
||||
#if __BORLANDC__ >= 0x590
|
||||
# define BOOST_HAS_TR1_HASH
|
||||
|
||||
@@ -321,6 +321,10 @@
|
||||
# define BOOST_NO_CXX17_FOLD_EXPRESSIONS
|
||||
#endif
|
||||
|
||||
#if (__clang_major__ < 4) || (__cplusplus < 201406L) /* non-standard value that is greater than 201402, which is reported by clang 4.0.0 for C++1z */
|
||||
# define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#endif
|
||||
|
||||
#if __cplusplus < 201103L
|
||||
#define BOOST_NO_CXX11_SFINAE_EXPR
|
||||
#endif
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
// Distributed under the Boost Software License, Version 1.0.
|
||||
// https://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
#if !defined(__APPLE__)
|
||||
#if !defined(__apple_build_version__)
|
||||
|
||||
# define BOOST_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__ % 100)
|
||||
|
||||
@@ -11,7 +11,13 @@
|
||||
|
||||
// https://en.wikipedia.org/wiki/Xcode#Toolchain_versions
|
||||
|
||||
# if BOOST_CLANG_REPORTED_VERSION >= 140000
|
||||
# if BOOST_CLANG_REPORTED_VERSION >= 150000
|
||||
# define BOOST_CLANG_VERSION 160000
|
||||
|
||||
# elif BOOST_CLANG_REPORTED_VERSION >= 140003
|
||||
# define BOOST_CLANG_VERSION 150000
|
||||
|
||||
# elif BOOST_CLANG_REPORTED_VERSION >= 140000
|
||||
# define BOOST_CLANG_VERSION 140000
|
||||
|
||||
# elif BOOST_CLANG_REPORTED_VERSION >= 130100
|
||||
|
||||
@@ -316,6 +316,10 @@
|
||||
# define BOOST_NO_CXX17_IF_CONSTEXPR
|
||||
#endif
|
||||
|
||||
#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
|
||||
# define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#endif
|
||||
|
||||
//
|
||||
// TR1 macros:
|
||||
//
|
||||
|
||||
@@ -171,10 +171,12 @@
|
||||
#if !defined(__cpp_fold_expressions) || (__cpp_fold_expressions < 201603)
|
||||
# define BOOST_NO_CXX17_FOLD_EXPRESSIONS
|
||||
#endif
|
||||
|
||||
#if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
|
||||
# define BOOST_NO_CXX17_IF_CONSTEXPR
|
||||
#endif
|
||||
#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
|
||||
# define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#endif
|
||||
|
||||
#ifdef c_plusplus
|
||||
// EDG has "long long" in non-strict mode
|
||||
|
||||
@@ -130,6 +130,9 @@
|
||||
#if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
|
||||
# define BOOST_NO_CXX17_IF_CONSTEXPR
|
||||
#endif
|
||||
#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
|
||||
# define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#endif
|
||||
|
||||
#if (__DMC__ <= 0x840)
|
||||
#error "Compiler not supported or configured - please reconfigure"
|
||||
|
||||
@@ -319,6 +319,9 @@
|
||||
#if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
|
||||
# define BOOST_NO_CXX17_IF_CONSTEXPR
|
||||
#endif
|
||||
#if (__GNUC__ < 7) || (__cplusplus < 201703L)
|
||||
# define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#endif
|
||||
|
||||
#if __GNUC__ >= 7
|
||||
# define BOOST_FALLTHROUGH __attribute__((fallthrough))
|
||||
|
||||
@@ -108,7 +108,8 @@
|
||||
#if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
|
||||
# define BOOST_NO_CXX17_IF_CONSTEXPR
|
||||
#endif
|
||||
#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
|
||||
# define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#endif
|
||||
|
||||
#define BOOST_COMPILER "GCC-XML C++ version " __GCCXML__
|
||||
|
||||
|
||||
|
||||
@@ -137,6 +137,10 @@
|
||||
#define BOOST_NO_CXX11_VARIADIC_MACROS
|
||||
#endif
|
||||
|
||||
#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
|
||||
# define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
//
|
||||
|
||||
@@ -173,6 +173,9 @@
|
||||
#if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
|
||||
# define BOOST_NO_CXX17_IF_CONSTEXPR
|
||||
#endif
|
||||
#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
|
||||
# define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#endif
|
||||
|
||||
#define BOOST_COMPILER "Metrowerks CodeWarrior C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
|
||||
|
||||
|
||||
@@ -122,6 +122,9 @@
|
||||
#if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
|
||||
# define BOOST_NO_CXX17_IF_CONSTEXPR
|
||||
#endif
|
||||
#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
|
||||
# define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#endif
|
||||
|
||||
//
|
||||
// versions check:
|
||||
|
||||
@@ -57,5 +57,8 @@
|
||||
# define BOOST_NO_CXX11_NOEXCEPT
|
||||
#endif
|
||||
|
||||
#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
|
||||
# define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -135,4 +135,7 @@
|
||||
#if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
|
||||
# define BOOST_NO_CXX17_IF_CONSTEXPR
|
||||
#endif
|
||||
#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
|
||||
# define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -194,6 +194,9 @@
|
||||
#if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
|
||||
# define BOOST_NO_CXX17_IF_CONSTEXPR
|
||||
#endif
|
||||
#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
|
||||
# define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#endif
|
||||
|
||||
// Turn on threading support for Solaris 12.
|
||||
// Ticket #11972
|
||||
|
||||
@@ -184,3 +184,6 @@
|
||||
#if !defined(__cpp_if_constexpr) || (__cpp_if_constexpr < 201606)
|
||||
# define BOOST_NO_CXX17_IF_CONSTEXPR
|
||||
#endif
|
||||
#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
|
||||
# define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#endif
|
||||
|
||||
@@ -263,6 +263,9 @@
|
||||
#define BOOST_NO_CXX17_INLINE_VARIABLES
|
||||
#define BOOST_NO_CXX17_FOLD_EXPRESSIONS
|
||||
#endif
|
||||
#if (_MSC_VER < 1914) || (_MSVC_LANG < 201703)
|
||||
#define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#endif
|
||||
|
||||
//
|
||||
// Things that don't work in clr mode:
|
||||
|
||||
@@ -265,6 +265,10 @@
|
||||
# define BOOST_NO_CXX17_FOLD_EXPRESSIONS
|
||||
#endif
|
||||
|
||||
#if !defined(__cpp_nontype_template_parameter_auto) || (__cpp_nontype_template_parameter_auto < 201606)
|
||||
# define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#endif
|
||||
|
||||
#if !__has_feature(cxx_thread_local)
|
||||
# define BOOST_NO_CXX11_THREAD_LOCAL
|
||||
#endif
|
||||
|
||||
@@ -157,6 +157,7 @@
|
||||
#define BOOST_NO_CXX17_INLINE_VARIABLES
|
||||
#define BOOST_NO_CXX17_FOLD_EXPRESSIONS
|
||||
#define BOOST_NO_CXX17_IF_CONSTEXPR
|
||||
#define BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
|
||||
// -------------------------------------
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// This file was automatically generated on Fri Oct 13 19:09:38 2023
|
||||
// This file was automatically generated on Mon Jan 22 16:16:53 2024
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-21.
|
||||
// Use, modification and distribution are subject to the
|
||||
@@ -164,6 +164,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(BOOST_NO_CXX14)\
|
||||
|| defined(BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS)\
|
||||
|| defined(BOOST_NO_CXX17_DEDUCTION_GUIDES)\
|
||||
|| defined(BOOST_NO_CXX17_FOLD_EXPRESSIONS)\
|
||||
|| defined(BOOST_NO_CXX17_HDR_ANY)\
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
// BOOST_VERSION / 100 % 1000 is the minor version
|
||||
// BOOST_VERSION / 100000 is the major version
|
||||
|
||||
#define BOOST_VERSION 108400
|
||||
#define BOOST_VERSION 108800
|
||||
|
||||
//
|
||||
// BOOST_LIB_VERSION must be defined to be the same as BOOST_VERSION
|
||||
@@ -27,6 +27,6 @@
|
||||
// number, y is the minor version number, and z is the patch level if not 0.
|
||||
// This is used by <config/auto_link.hpp> to select which library version to link to.
|
||||
|
||||
#define BOOST_LIB_VERSION "1_84"
|
||||
#define BOOST_LIB_VERSION "1_88"
|
||||
|
||||
#endif
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# Regression test Jamfile for boost configuration setup.
|
||||
# *** DO NOT EDIT THIS FILE BY HAND ***
|
||||
# This file was automatically generated on Fri Oct 13 19:09:38 2023
|
||||
# This file was automatically generated on Mon Jan 22 16:16:53 2024
|
||||
# by libs/config/tools/generate.cpp
|
||||
# Copyright John Maddock.
|
||||
# Use, modification and distribution are subject to the
|
||||
@@ -346,6 +346,9 @@ test-suite "BOOST_NO_CXX14_VARIABLE_TEMPLATES" :
|
||||
test-suite "BOOST_NO_CXX17" :
|
||||
[ run ../no_cxx17_pass.cpp ]
|
||||
[ compile-fail ../no_cxx17_fail.cpp ] ;
|
||||
test-suite "BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS" :
|
||||
[ run ../no_cxx17_auto_nontype_template_params_pass.cpp ]
|
||||
[ compile-fail ../no_cxx17_auto_nontype_template_params_fail.cpp ] ;
|
||||
test-suite "BOOST_NO_CXX17_DEDUCTION_GUIDES" :
|
||||
[ run ../no_cxx17_deduction_guides_pass.cpp ]
|
||||
[ compile-fail ../no_cxx17_deduction_guides_fail.cpp ] ;
|
||||
|
||||
31
test/boost_no_cxx17_auto_nontype_template_params.ipp
Normal file
31
test/boost_no_cxx17_auto_nontype_template_params.ipp
Normal file
@@ -0,0 +1,31 @@
|
||||
/*
|
||||
* Copyright 2024 Andrey Semashev
|
||||
*
|
||||
* Distributed under Boost Software License, Version 1.0.
|
||||
* (See accompanying file LICENSE_1_0.txt or copy at
|
||||
* http://www.boost.org/LICENSE_1_0.txt)
|
||||
*/
|
||||
|
||||
// MACRO: BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
// TITLE: C++17 auto non-type template parameters
|
||||
// DESCRIPTION: C++17 auto non-type template parameters are not supported.
|
||||
|
||||
namespace boost_no_cxx17_auto_nontype_template_params {
|
||||
|
||||
template< auto Value >
|
||||
struct foo
|
||||
{
|
||||
static auto get()
|
||||
{
|
||||
return Value;
|
||||
}
|
||||
};
|
||||
|
||||
const int ten = 10;
|
||||
|
||||
int test()
|
||||
{
|
||||
return foo< 10 >::get() - *foo< &ten >::get();
|
||||
}
|
||||
|
||||
} // boost_no_cxx17_auto_nontype_template_params
|
||||
@@ -1168,6 +1168,7 @@ void print_boost_macros()
|
||||
PRINT_MACRO(BOOST_NO_CXX14_STD_EXCHANGE);
|
||||
PRINT_MACRO(BOOST_NO_CXX14_VARIABLE_TEMPLATES);
|
||||
PRINT_MACRO(BOOST_NO_CXX17);
|
||||
PRINT_MACRO(BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS);
|
||||
PRINT_MACRO(BOOST_NO_CXX17_DEDUCTION_GUIDES);
|
||||
PRINT_MACRO(BOOST_NO_CXX17_FOLD_EXPRESSIONS);
|
||||
PRINT_MACRO(BOOST_NO_CXX17_HDR_ANY);
|
||||
@@ -1287,6 +1288,7 @@ void print_boost_macros()
|
||||
|
||||
|
||||
|
||||
|
||||
// END GENERATED BLOCK
|
||||
|
||||
PRINT_MACRO(BOOST_CXX_VERSION);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// This file was automatically generated on Fri Oct 13 19:09:38 2023
|
||||
// This file was automatically generated on Mon Jan 22 16:16:53 2024
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-21.
|
||||
// Use, modification and distribution are subject to the
|
||||
@@ -377,6 +377,11 @@ namespace boost_no_cxx14_variable_templates = empty_boost;
|
||||
#else
|
||||
namespace boost_no_cxx17 = empty_boost;
|
||||
#endif
|
||||
#ifndef BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#include "boost_no_cxx17_auto_nontype_template_params.ipp"
|
||||
#else
|
||||
namespace boost_no_cxx17_auto_nontype_template_params = empty_boost;
|
||||
#endif
|
||||
#ifndef BOOST_NO_CXX17_DEDUCTION_GUIDES
|
||||
#include "boost_no_cxx17_deduction_guides.ipp"
|
||||
#else
|
||||
@@ -1741,6 +1746,11 @@ int main( int, char *[] )
|
||||
std::cerr << "Failed test for BOOST_NO_CXX17 at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
++error_count;
|
||||
}
|
||||
if(0 != boost_no_cxx17_auto_nontype_template_params::test())
|
||||
{
|
||||
std::cerr << "Failed test for BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
++error_count;
|
||||
}
|
||||
if(0 != boost_no_cxx17_deduction_guides::test())
|
||||
{
|
||||
std::cerr << "Failed test for BOOST_NO_CXX17_DEDUCTION_GUIDES at: " << __FILE__ << ":" << __LINE__ << std::endl;
|
||||
|
||||
37
test/no_cxx17_auto_nontype_template_params_fail.cpp
Normal file
37
test/no_cxx17_auto_nontype_template_params_fail.cpp
Normal file
@@ -0,0 +1,37 @@
|
||||
// This file was automatically generated on Mon Jan 22 16:16:53 2024
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-21.
|
||||
// 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_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
// This file should not compile, if it does then
|
||||
// BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS should not be defined.
|
||||
// See file boost_no_cxx17_auto_nontype_template_params.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_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#include "boost_no_cxx17_auto_nontype_template_params.ipp"
|
||||
#else
|
||||
#error "this file should not compile"
|
||||
#endif
|
||||
|
||||
int main( int, char *[] )
|
||||
{
|
||||
return boost_no_cxx17_auto_nontype_template_params::test();
|
||||
}
|
||||
|
||||
37
test/no_cxx17_auto_nontype_template_params_pass.cpp
Normal file
37
test/no_cxx17_auto_nontype_template_params_pass.cpp
Normal file
@@ -0,0 +1,37 @@
|
||||
// This file was automatically generated on Mon Jan 22 16:16:53 2024
|
||||
// by libs/config/tools/generate.cpp
|
||||
// Copyright John Maddock 2002-21.
|
||||
// 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_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
// This file should compile, if it does not then
|
||||
// BOOST_NO_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS should be defined.
|
||||
// See file boost_no_cxx17_auto_nontype_template_params.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_CXX17_AUTO_NONTYPE_TEMPLATE_PARAMS
|
||||
#include "boost_no_cxx17_auto_nontype_template_params.ipp"
|
||||
#else
|
||||
namespace boost_no_cxx17_auto_nontype_template_params = empty_boost;
|
||||
#endif
|
||||
|
||||
int main( int, char *[] )
|
||||
{
|
||||
return boost_no_cxx17_auto_nontype_template_params::test();
|
||||
}
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <boost/regex.hpp>
|
||||
#include <boost/filesystem/path.hpp>
|
||||
#include <boost/filesystem/operations.hpp>
|
||||
#include <boost/filesystem/directory.hpp>
|
||||
#include <boost/filesystem/fstream.hpp>
|
||||
#include <boost/detail/lightweight_main.hpp>
|
||||
#include <iostream>
|
||||
@@ -267,10 +268,10 @@ void process_ipp_file(const fs::path& file, bool positive_test)
|
||||
|
||||
// get the output filesnames:
|
||||
boost::regex file_regex("boost_([^.]+)\\.ipp");
|
||||
positive_file = file.branch_path() / boost::regex_replace(file.leaf().string(), file_regex, "$1_pass.cpp");
|
||||
negative_file = file.branch_path() / boost::regex_replace(file.leaf().string(), file_regex, "$1_fail.cpp");
|
||||
write_test_file(positive_file, macro_name, namespace_name, file.leaf().string(), positive_test, true);
|
||||
write_test_file(negative_file, macro_name, namespace_name, file.leaf().string(), positive_test, false);
|
||||
positive_file = file.parent_path() / boost::regex_replace(file.filename().string(), file_regex, "$1_pass.cpp");
|
||||
negative_file = file.parent_path() / boost::regex_replace(file.filename().string(), file_regex, "$1_fail.cpp");
|
||||
write_test_file(positive_file, macro_name, namespace_name, file.filename().string(), positive_test, true);
|
||||
write_test_file(negative_file, macro_name, namespace_name, file.filename().string(), positive_test, false);
|
||||
|
||||
// always create config_test data,
|
||||
// positive and negative tests go to separate streams, because for some
|
||||
@@ -280,7 +281,7 @@ void process_ipp_file(const fs::path& file, bool positive_test)
|
||||
if(!positive_test)
|
||||
*pout << "n";
|
||||
*pout << "def " << macro_name
|
||||
<< "\n#include \"" << file.leaf().string() << "\"\n#else\nnamespace "
|
||||
<< "\n#include \"" << file.filename().string() << "\"\n#else\nnamespace "
|
||||
<< namespace_name << " = empty_boost;\n#endif\n";
|
||||
|
||||
config_test2 << " if(0 != " << namespace_name << "::test())\n"
|
||||
@@ -291,12 +292,12 @@ void process_ipp_file(const fs::path& file, bool positive_test)
|
||||
|
||||
// always generate the jamfile data:
|
||||
jamfile << "test-suite \"" << macro_name << "\" : \n"
|
||||
"[ run " << positive_file.leaf().string() << " <template>config_options ]\n"
|
||||
"[ compile-fail " << negative_file.leaf().string() << " <template>config_options ] ;\n";
|
||||
"[ run " << positive_file.filename().string() << " <template>config_options ]\n"
|
||||
"[ compile-fail " << negative_file.filename().string() << " <template>config_options ] ;\n";
|
||||
|
||||
jamfile_v2 << "test-suite \"" << macro_name << "\" : \n"
|
||||
"[ run ../" << positive_file.leaf().string() << " ]\n"
|
||||
"[ compile-fail ../" << negative_file.leaf().string() << " ] ;\n";
|
||||
"[ run ../" << positive_file.filename().string() << " ]\n"
|
||||
"[ compile-fail ../" << negative_file.filename().string() << " ] ;\n";
|
||||
|
||||
// Generate data for the Build-checks test file:
|
||||
build_config_test << "#ifdef TEST_" << macro_name << std::endl;
|
||||
@@ -597,7 +598,7 @@ int cpp_main(int argc, char* argv[])
|
||||
{
|
||||
// try __FILE__:
|
||||
fs::path p(__FILE__);
|
||||
config_path = p.branch_path().branch_path() / "test";
|
||||
config_path = p.parent_path().parent_path() / "test";
|
||||
}
|
||||
std::cout << "Info: Boost.Config test path set as: " << config_path.string() << std::endl;
|
||||
|
||||
@@ -608,7 +609,7 @@ int cpp_main(int argc, char* argv[])
|
||||
std::map<fs::path, bool> files_to_process;
|
||||
while(i != j)
|
||||
{
|
||||
if(boost::regex_match(i->path().leaf().string(), ipp_match, ipp_mask))
|
||||
if(boost::regex_match(i->path().filename().string(), ipp_match, ipp_mask))
|
||||
{
|
||||
files_to_process[*i] = ipp_match[1].matched;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user