From 53c87c192f9077ad4ca17f56aeefc56b71263910 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Fri, 4 Feb 2022 09:03:48 +0000 Subject: [PATCH] Correct clang-win b2 invocation. Make always be included when available. --- .github/workflows/ci.yml | 4 ++-- include/boost/config/detail/suffix.hpp | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 187c3ff8..d51e5313 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -277,10 +277,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=clang-win + run: ..\..\..\b2 print_config_info cxxstd=14,17,latest address-model=64 toolset=clang-win embed-manifest-via=linker working-directory: ../boost-root/libs/config/test - name: Test - run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17,latest toolset=clang-win + run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17,latest toolset=clang-win embed-manifest-via=linker working-directory: ../boost-root/libs/config/test non_intel_ubuntu_20_04_gcc: runs-on: ubuntu-20.04 diff --git a/include/boost/config/detail/suffix.hpp b/include/boost/config/detail/suffix.hpp index c11a4140..b8b37d0b 100644 --- a/include/boost/config/detail/suffix.hpp +++ b/include/boost/config/detail/suffix.hpp @@ -1205,6 +1205,9 @@ namespace std{ using ::type_info; } #ifdef __has_include #if !__has_include() # define BOOST_NO_CXX20_HDR_VERSION +#else +// For convenience, this is always included: +# include #endif #else # define BOOST_NO_CXX20_HDR_VERSION