Browse Source

MSVC 2015 compatibility: give up also on this.

pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
0f599567bb
  1. 6
      src/Magnum/Test/ImageTest.cpp
  2. 6
      src/Magnum/Trade/Test/ImageDataTest.cpp

6
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<const Image2D, ImageView2D>::value));
CORRADE_VERIFY(!(std::is_convertible<const Image2D&&, ImageView2D>::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<const CompressedImage2D, CompressedImageView2D>::value));
CORRADE_VERIFY(!(std::is_convertible<const CompressedImage2D&&, CompressedImageView2D>::value));
}

6
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<const Trade::ImageData2D, ImageView2D>::value));
CORRADE_VERIFY(!(std::is_convertible<const Trade::ImageData2D&&, ImageView2D>::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<const Trade::ImageData2D, CompressedImageView2D>::value));
CORRADE_VERIFY(!(std::is_convertible<const Trade::ImageData2D&&, CompressedImageView2D>::value));
}

Loading…
Cancel
Save