diff --git a/src/Magnum/Implementation/FramebufferState.cpp b/src/Magnum/Implementation/FramebufferState.cpp index 3b715b1a2..bfbb64d0d 100644 --- a/src/Magnum/Implementation/FramebufferState.cpp +++ b/src/Magnum/Implementation/FramebufferState.cpp @@ -33,7 +33,11 @@ namespace Magnum { namespace Implementation { +#ifndef CORRADE_MSVC2015_COMPATIBILITY constexpr const Range2Di FramebufferState::DisengagedViewport; +#else +const Range2Di FramebufferState::DisengagedViewport{{}, {-1, -1}}; +#endif FramebufferState::FramebufferState(Context& context, std::vector& extensions): readBinding{0}, drawBinding{0}, renderbufferBinding{0}, maxDrawBuffers{0}, maxColorAttachments{0}, maxRenderbufferSize{0}, #if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2)) diff --git a/src/Magnum/Implementation/FramebufferState.h b/src/Magnum/Implementation/FramebufferState.h index 3fffdd42e..68e39ec1f 100644 --- a/src/Magnum/Implementation/FramebufferState.h +++ b/src/Magnum/Implementation/FramebufferState.h @@ -33,7 +33,13 @@ namespace Magnum { namespace Implementation { struct FramebufferState { + #ifndef CORRADE_MSVC2015_COMPATIBILITY + /* MSVC complains that in-class initialization is not yet implemented */ constexpr static const Range2Di DisengagedViewport{{}, {-1, -1}}; + #else + static const Range2Di DisengagedViewport; + #endif + explicit FramebufferState(Context& context, std::vector& extensions); diff --git a/src/Magnum/Math/Matrix.h b/src/Magnum/Math/Matrix.h index c11af3489..2fe517423 100644 --- a/src/Magnum/Math/Matrix.h +++ b/src/Magnum/Math/Matrix.h @@ -54,6 +54,9 @@ template class Matrix: public RectangularMatrix class Matrix: public RectangularMatrix