Sync from upstream.

This commit is contained in:
Rene Rivera 2024-05-30 11:21:22 -05:00
commit 278d3f0060
2 changed files with 10 additions and 6 deletions

View File

@ -310,15 +310,15 @@ jobs:
- libc++-15-dev - libc++-15-dev
- libc++abi-15-dev - libc++abi-15-dev
- toolset: clang
cxxstd: "03,11,14,17,2a"
os: macos-11
- toolset: clang - toolset: clang
cxxstd: "03,11,14,17,20,2b" cxxstd: "03,11,14,17,20,2b"
os: macos-12 os: macos-12
- toolset: clang - toolset: clang
cxxstd: "03,11,14,17,20,2b" cxxstd: "03,11,14,17,20,2b"
os: macos-13 os: macos-13
- toolset: clang
cxxstd: "03,11,14,17,20,2b"
os: macos-14
timeout-minutes: 45 timeout-minutes: 45
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
@ -611,9 +611,9 @@ jobs:
include: include:
- os: ubuntu-20.04 - os: ubuntu-20.04
- os: ubuntu-22.04 - os: ubuntu-22.04
- os: macos-11
- os: macos-12 - os: macos-12
- os: macos-13 - os: macos-13
- os: macos-14
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
timeout-minutes: 10 timeout-minutes: 10
@ -678,9 +678,9 @@ jobs:
include: include:
- os: ubuntu-20.04 - os: ubuntu-20.04
- os: ubuntu-22.04 - os: ubuntu-22.04
- os: macos-11
- os: macos-12 - os: macos-12
- os: macos-13 - os: macos-13
- os: macos-14
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
timeout-minutes: 10 timeout-minutes: 10
@ -755,9 +755,9 @@ jobs:
include: include:
- os: ubuntu-20.04 - os: ubuntu-20.04
- os: ubuntu-22.04 - os: ubuntu-22.04
- os: macos-11
- os: macos-12 - os: macos-12
- os: macos-13 - os: macos-13
- os: macos-14
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
timeout-minutes: 20 timeout-minutes: 20

View File

@ -346,6 +346,8 @@ template<> struct tn_holder<boost::uint128_type>
#endif #endif
#if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
template<> struct tn_holder<wchar_t> template<> struct tn_holder<wchar_t>
{ {
static std::string type_name( std::string const& suffix ) static std::string type_name( std::string const& suffix )
@ -354,6 +356,8 @@ template<> struct tn_holder<wchar_t>
} }
}; };
#endif
#if !defined(BOOST_NO_CXX11_CHAR16_T) #if !defined(BOOST_NO_CXX11_CHAR16_T)
template<> struct tn_holder<char16_t> template<> struct tn_holder<char16_t>