MSVC 2013 compatibility: also no non-static data member initializers.

11 years ago · d9ad90dcd0
2 changed files with 2 additions and 2 deletions
--- a/src/Magnum/Implementation/FramebufferState.cpp
+++ b/src/Magnum/Implementation/FramebufferState.cpp
@ -33,7 +33,7 @@

 namespace Magnum { namespace Implementation {

-#ifndef CORRADE_GCC46_COMPATIBILITY
+#if !defined(CORRADE_GCC46_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY)
 constexpr const Range2Di FramebufferState::DisengagedViewport;
 #else
 const Range2Di FramebufferState::DisengagedViewport{{}, {-1, -1}};
--- a/src/Magnum/Implementation/FramebufferState.h
+++ b/src/Magnum/Implementation/FramebufferState.h
@ -43,7 +43,7 @@
 namespace Magnum { namespace Implementation {

 struct FramebufferState {
-    #ifndef CORRADE_GCC46_COMPATIBILITY
+    #if !defined(CORRADE_GCC46_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY)
    constexpr static const Range2Di DisengagedViewport{{}, {-1, -1}};
    #else
    static const Range2Di DisengagedViewport;