diff --git a/src/Magnum/Test/ImageTest.cpp b/src/Magnum/Test/ImageTest.cpp index e9be84555..61d0b6967 100644 --- a/src/Magnum/Test/ImageTest.cpp +++ b/src/Magnum/Test/ImageTest.cpp @@ -219,6 +219,9 @@ void ImageTest::toReference() { #ifdef CORRADE_GCC47_COMPATIBILITY CORRADE_EXPECT_FAIL("Rvalue references for *this are not supported in GCC < 4.8.1."); #endif + #ifdef CORRADE_MSVC2015_COMPATIBILITY + CORRADE_EXPECT_FAIL("std::is_convertible is still buggy in MSVC 2015."); + #endif CORRADE_VERIFY(!(std::is_convertible::value)); CORRADE_VERIFY(!(std::is_convertible::value)); } @@ -246,6 +249,9 @@ void ImageTest::toReferenceCommpressed() { #ifdef CORRADE_GCC47_COMPATIBILITY CORRADE_EXPECT_FAIL("Rvalue references for *this are not supported in GCC < 4.8.1."); #endif + #ifdef CORRADE_MSVC2015_COMPATIBILITY + CORRADE_EXPECT_FAIL("std::is_convertible is still buggy in MSVC 2015."); + #endif CORRADE_VERIFY(!(std::is_convertible::value)); CORRADE_VERIFY(!(std::is_convertible::value)); } diff --git a/src/Magnum/Trade/Test/ImageDataTest.cpp b/src/Magnum/Trade/Test/ImageDataTest.cpp index ec6f4e9ce..a2c41b5c2 100644 --- a/src/Magnum/Trade/Test/ImageDataTest.cpp +++ b/src/Magnum/Trade/Test/ImageDataTest.cpp @@ -180,6 +180,9 @@ void ImageDataTest::toReference() { #ifdef CORRADE_GCC47_COMPATIBILITY CORRADE_EXPECT_FAIL("Rvalue references for *this are not supported in GCC < 4.8.1."); #endif + #ifdef CORRADE_MSVC2015_COMPATIBILITY + CORRADE_EXPECT_FAIL("std::is_convertible is still buggy in MSVC 2015."); + #endif CORRADE_VERIFY(!(std::is_convertible::value)); CORRADE_VERIFY(!(std::is_convertible::value)); } @@ -200,6 +203,9 @@ void ImageDataTest::toReferenceCompressed() { #ifdef CORRADE_GCC47_COMPATIBILITY CORRADE_EXPECT_FAIL("Rvalue references for *this are not supported in GCC < 4.8.1."); #endif + #ifdef CORRADE_MSVC2015_COMPATIBILITY + CORRADE_EXPECT_FAIL("std::is_convertible is still buggy in MSVC 2015."); + #endif CORRADE_VERIFY(!(std::is_convertible::value)); CORRADE_VERIFY(!(std::is_convertible::value)); }