diff --git a/src/Magnum/Image.h b/src/Magnum/Image.h index e8d1c3866..baac399ed 100644 --- a/src/Magnum/Image.h +++ b/src/Magnum/Image.h @@ -83,13 +83,13 @@ template class Image: public AbstractImage { /** @brief Conversion to reference */ /*implicit*/ operator ImageReference() - #ifndef CORRADE_GCC47_COMPATIBILITY + #if !defined(CORRADE_GCC47_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY) const &; #else const; #endif - #ifndef CORRADE_GCC47_COMPATIBILITY + #if !defined(CORRADE_GCC47_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY) /** @overload */ /*implicit*/ operator ImageReference() const && = delete; #endif @@ -171,7 +171,7 @@ template inline Image& Image::op } template inline Image::operator ImageReference() -#ifndef CORRADE_GCC47_COMPATIBILITY +#if !defined(CORRADE_GCC47_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY) const & #else const diff --git a/src/Magnum/Test/ImageTest.cpp b/src/Magnum/Test/ImageTest.cpp index 77e6bc2a1..1fa5366ea 100644 --- a/src/Magnum/Test/ImageTest.cpp +++ b/src/Magnum/Test/ImageTest.cpp @@ -125,8 +125,8 @@ void ImageTest::toReference() { CORRADE_VERIFY((std::is_convertible::value)); { - #ifdef CORRADE_GCC47_COMPATIBILITY - CORRADE_EXPECT_FAIL("Rvalue references for *this are not supported in GCC < 4.8.1."); + #if defined(CORRADE_GCC47_COMPATIBILITY) || defined(CORRADE_MSVC2013_COMPATIBILITY) + CORRADE_EXPECT_FAIL("Rvalue references for *this are not supported in GCC < 4.8.1 or MSVC."); #endif CORRADE_VERIFY(!(std::is_convertible::value)); CORRADE_VERIFY(!(std::is_convertible::value)); diff --git a/src/Magnum/Trade/ImageData.h b/src/Magnum/Trade/ImageData.h index c50ac610b..3ce4980ae 100644 --- a/src/Magnum/Trade/ImageData.h +++ b/src/Magnum/Trade/ImageData.h @@ -73,13 +73,13 @@ template class ImageData: public AbstractImage { /** @brief Conversion to reference */ /*implicit*/ operator ImageReference() - #ifndef CORRADE_GCC47_COMPATIBILITY + #if !defined(CORRADE_GCC47_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY) const &; #else const; #endif - #ifndef CORRADE_GCC47_COMPATIBILITY + #if !defined(CORRADE_GCC47_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY) /** @overload */ /*implicit*/ operator ImageReference() const && = delete; #endif @@ -142,7 +142,7 @@ template inline ImageData& ImageData inline ImageData::operator ImageReference() -#ifndef CORRADE_GCC47_COMPATIBILITY +#if !defined(CORRADE_GCC47_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY) const & #else const diff --git a/src/Magnum/Trade/Test/ImageDataTest.cpp b/src/Magnum/Trade/Test/ImageDataTest.cpp index fc82a372f..a8ef8697e 100644 --- a/src/Magnum/Trade/Test/ImageDataTest.cpp +++ b/src/Magnum/Trade/Test/ImageDataTest.cpp @@ -111,8 +111,8 @@ void ImageDataTest::toReference() { CORRADE_VERIFY((std::is_convertible::value)); { - #ifdef CORRADE_GCC47_COMPATIBILITY - CORRADE_EXPECT_FAIL("Rvalue references for *this are not supported in GCC < 4.8.1."); + #if defined(CORRADE_GCC47_COMPATIBILITY) || defined(CORRADE_MSVC2013_COMPATIBILITY) + CORRADE_EXPECT_FAIL("Rvalue references for *this are not supported in GCC < 4.8.1 or MSVC."); #endif CORRADE_VERIFY(!(std::is_convertible::value)); CORRADE_VERIFY(!(std::is_convertible::value));