From 70c0ca7c6653870be54fdbc13c075e297f583188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 27 Sep 2015 21:43:29 +0200 Subject: [PATCH] Fix constexpr mismatch on MSVC 2015 and GLES. --- src/Magnum/ImageView.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Magnum/ImageView.h b/src/Magnum/ImageView.h index 5bdcf57c5..6290e6a44 100644 --- a/src/Magnum/ImageView.h +++ b/src/Magnum/ImageView.h @@ -241,7 +241,7 @@ template class CompressedImageView { * Similar the above, but uses default @ref CompressedPixelStorage * parameters (or the hardcoded ones in OpenGL ES and WebGL). */ - #ifndef CORRADE_MSVC2015_COMPATIBILITY + #if !defined(CORRADE_MSVC2015_COMPATIBILITY) || defined(MAGNUM_TARGET_GLES) /* Can't use delegating constructors with constexpr -- https://connect.microsoft.com/VisualStudio/feedback/details/1579279/c-constexpr-does-not-work-with-delegating-constructors */ constexpr #endif