Skip to content

Commit a0e1ffe

Browse files
committed
Merge branch 'carsonradtke/fix-static-assertion' into carsonradtke/fix-github-pipeline
2 parents 5ce7964 + 271f6ab commit a0e1ffe

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tests/span_tests.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,8 @@ TEST(span_test, from_std_array_constructor)
412412
static_assert(!CtorCompilesFor<span<int, 5>, std::array<int, 4>&>,
413413
"!CtorCompilesFor<span<int, 5>, std::array<int, 4>&>");
414414

415-
#if !defined(_MSC_VER) || (_MSC_VER > 1943) || (__cplusplus >= 201703L)
416-
// Fails on "Visual Studio 16 2019/Visual Studio 17 2022, windows-2019/2022, Debug/Release, 14".
415+
#if !defined(_MSC_VER) || (__cplusplus >= 201703L)
416+
// Fails on MSVC. TODO: report a feedback bug.
417417
static_assert(!ConversionCompilesFor<span<int>, std::array<int, 4>>,
418418
"!ConversionCompilesFor<span<int>, std::array<int, 4>>");
419419
#endif
@@ -529,8 +529,8 @@ TEST(span_test, from_container_constructor)
529529
EXPECT_TRUE(cs.data() == cstr.data());
530530
}
531531

532-
#if !defined(_MSC_VER) || (_MSC_VER > 1943) || (__cplusplus >= 201703L)
533-
// Fails on "Visual Studio 16 2019/Visual Studio 17 2022, windows-2019/2022, Debug/Release, 14".
532+
#if !defined(_MSC_VER) || (__cplusplus >= 201703L)
533+
// Fails on MSVC. TODO: report a feedback bug.
534534
static_assert(!ConversionCompilesFor<span<int>, std::vector<int>>,
535535
"!ConversionCompilesFor<span<int>, std::vector<int>>");
536536
#endif // !defined(_MSC_VER) || (_MSC_VER > 1942) || (__cplusplus >= 201703L)

0 commit comments

Comments
 (0)