From d9ad90dcd0439fc648002aefb1cf9982c696a0b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 4 May 2015 20:39:09 +0200 Subject: [PATCH] MSVC 2013 compatibility: also no non-static data member initializers. --- src/Magnum/Implementation/FramebufferState.cpp | 2 +- src/Magnum/Implementation/FramebufferState.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Magnum/Implementation/FramebufferState.cpp b/src/Magnum/Implementation/FramebufferState.cpp index b33a6a171..02371c5c6 100644 --- 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}}; diff --git a/src/Magnum/Implementation/FramebufferState.h b/src/Magnum/Implementation/FramebufferState.h index 29634c3c0..bb65d6c2f 100644 --- 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;