boostorg/type_traits
1
0
Fork 1
mirror of https://github.com/boostorg/type_traits.git synced 2025-07-30 20:47:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

One more fix to CI script. Also fix msvc test failures.

Browse Source
This commit is contained in:
jzmaddock
2021-03-07 11:42:55 +00:00
parent 4c2b7d5215
commit 71208778dd
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View File

@ -209,7 +209,7 @@ jobs:
fail-fast: false
matrix:
toolset: [ clang ]
standard: [ 03, 11, 14, 17, 2a ]
standard: [ "03", 11, 14, 17, 2a ]
steps:
- uses: actions/checkout@v2
with:
@ -333,7 +333,7 @@ jobs:
run: config_info_travis
working-directory: ../boost-root/libs/config/test
- name: Test
run: ..\..\..\b2 --hash cxxstd=${{ matrix.standard }} toolset=msvc-14.0
run: ..\..\..\b2 --hash cxxstd=${{ matrix.standard }} toolset=msvc-14.0 define=CI_SUPPRESS_KNOWN_ISSUES
working-directory: ../boost-root/libs/type_traits/test
windows_msvc_14_2:
runs-on: windows-latest
@ -377,5 +377,5 @@ jobs:
run: config_info_travis
working-directory: ../boost-root/libs/config/test
- name: Test
run: ..\..\..\b2 --hash cxxstd=${{ matrix.standard }} toolset=msvc-14.2
run: ..\..\..\b2 --hash cxxstd=${{ matrix.standard }} toolset=msvc-14.2 define=CI_SUPPRESS_KNOWN_ISSUES
working-directory: ../boost-root/libs/type_traits/test

2
include/boost/type_traits/is_convertible.hpp
View File

@ -489,7 +489,7 @@ struct is_convertible : public integral_constant<bool, ::boost::detail::is_conve
template <class From, class To>
struct is_convertible : public integral_constant<bool, BOOST_IS_CONVERTIBLE(From, To)>
{
#if BOOST_WORKAROUND(BOOST_MSVC, <= 1900)
#if defined(BOOST_MSVC)
BOOST_STATIC_ASSERT_MSG(boost::is_complete<From>::value || boost::is_void<From>::value || boost::is_array<From>::value || boost::is_reference<From>::value, "From argument type to is_convertible must be a complete type");
#endif
#if defined(__clang__)

2
test/has_equal_to_test.cpp
View File

@ -223,7 +223,7 @@ void specific() {
// There are some things that pass that wouldn't otherwise do so:
auto f = []() {};
auto f2 = [](double)->int { return 2; };
#ifndef BOOST_MSVC
#if !defined(BOOST_MSVC) || (_MSC_FULL_VER >= 192829333)
TEST_TR(decltype(f), bool, true);
TEST_TR(decltype(f2), bool, true);
#else

2
test/has_not_equal_to_test.cpp
View File

@ -223,7 +223,7 @@ void specific() {
// There are some things that pass that wouldn't otherwise do so:
auto f = []() {};
auto f2 = [](double)->int { return 2; };
#ifndef BOOST_MSVC
#if !defined(BOOST_MSVC) || (_MSC_FULL_VER >= 192829333)
TEST_TR(decltype(f), bool, true);
TEST_TR(decltype(f2), bool, true);
#else