From a77338b1cd47232c5138311241136fd2bf5ae451 Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Tue, 21 May 2024 01:06:02 +0300 Subject: [PATCH 1/2] Use macos-14 image instead of macos-11 as the latter is being removed. --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d41d9c..d4bdfc6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -310,15 +310,15 @@ jobs: - libc++-15-dev - libc++abi-15-dev - - toolset: clang - cxxstd: "03,11,14,17,2a" - os: macos-11 - toolset: clang cxxstd: "03,11,14,17,20,2b" os: macos-12 - toolset: clang cxxstd: "03,11,14,17,20,2b" os: macos-13 + - toolset: clang + cxxstd: "03,11,14,17,20,2b" + os: macos-14 timeout-minutes: 45 runs-on: ${{matrix.os}} @@ -611,9 +611,9 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-11 - os: macos-12 - os: macos-13 + - os: macos-14 runs-on: ${{matrix.os}} timeout-minutes: 10 @@ -678,9 +678,9 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-11 - os: macos-12 - os: macos-13 + - os: macos-14 runs-on: ${{matrix.os}} timeout-minutes: 10 @@ -755,9 +755,9 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-11 - os: macos-12 - os: macos-13 + - os: macos-14 runs-on: ${{matrix.os}} timeout-minutes: 20 From 3f36d507f2cd9ba55716336c3fb1843d951830ae Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Tue, 28 May 2024 19:32:36 +0300 Subject: [PATCH 2/2] Disable the tn_holder specialization when BOOST_NO_INTRINSIC_WCHAR_T. Refs #173. --- include/boost/core/type_name.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/boost/core/type_name.hpp b/include/boost/core/type_name.hpp index c5cbbbd..81e00c2 100644 --- a/include/boost/core/type_name.hpp +++ b/include/boost/core/type_name.hpp @@ -346,6 +346,8 @@ template<> struct tn_holder #endif +#if !defined(BOOST_NO_INTRINSIC_WCHAR_T) + template<> struct tn_holder { static std::string type_name( std::string const& suffix ) @@ -354,6 +356,8 @@ template<> struct tn_holder } }; +#endif + #if !defined(BOOST_NO_CXX11_CHAR16_T) template<> struct tn_holder