From b777135116816daecd423f80be09487000e7a186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 16 Dec 2015 22:42:43 +0100
Subject: [PATCH] MSVC 2015 Update 1: in-class constexpr initialization works
 now.

---
 src/Magnum/Implementation/FramebufferState.cpp | 4 ----
 src/Magnum/Implementation/FramebufferState.h   | 5 -----
 src/Magnum/Math/Matrix.h                       | 4 ----
 3 files changed, 13 deletions(-)

diff --git a/src/Magnum/Implementation/FramebufferState.cpp b/src/Magnum/Implementation/FramebufferState.cpp
index 3a03b177c..6b6ef8755 100644
--- a/src/Magnum/Implementation/FramebufferState.cpp
+++ b/src/Magnum/Implementation/FramebufferState.cpp
@@ -33,11 +33,7 @@
 
 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<std::string>& 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 93df48c1f..55a04251e 100644
--- a/src/Magnum/Implementation/FramebufferState.h
+++ b/src/Magnum/Implementation/FramebufferState.h
@@ -40,12 +40,7 @@
 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<std::string>& extensions);
 
diff --git a/src/Magnum/Math/Matrix.h b/src/Magnum/Math/Matrix.h
index 0394dc684..630240aeb 100644
--- a/src/Magnum/Math/Matrix.h
+++ b/src/Magnum/Math/Matrix.h
@@ -54,9 +54,6 @@ template<std::size_t size, class T> class Matrix: public RectangularMatrix<size,
         };
 
         #ifdef MAGNUM_BUILD_DEPRECATED
-        /* Sorry, MSVC complains that in-class initialization is not yet
-           implemented and it is not worth fixing */
-        #ifndef CORRADE_MSVC2015_COMPATIBILITY
         /**
          * @brief Pass to constructor to create zero-filled matrix
          * @deprecated Use @ref ZeroInitT and @ref ZeroInit instead.
@@ -79,7 +76,6 @@ template<std::size_t size, class T> class Matrix: public RectangularMatrix<size,
         CORRADE_DEPRECATED("use Math::IdentityInit instead") constexpr static IdentityInitT Identity{IdentityInitT::Init{}};
         #endif
         #endif
-        #endif
 
         /**
          * @brief Default constructor