From 7af5e136fe1c8d4b5311da6a3be6c68e6c89f9b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Tue, 25 Aug 2015 22:29:36 +0200
Subject: [PATCH] MSVC 2015 compatibility: {}-related issues.

---
 src/Magnum/Math/Color.h             | 12 ++++++++----
 src/Magnum/Math/RectangularMatrix.h |  3 ++-
 src/Magnum/SceneGraph/Camera.h      |  3 ++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Magnum/Math/Color.h b/src/Magnum/Math/Color.h
index 07963ac70..ef01d0658 100644
--- a/src/Magnum/Math/Color.h
+++ b/src/Magnum/Math/Color.h
@@ -256,7 +256,8 @@ template<class T> class Color3: public Vector3<T> {
         constexpr /*implicit*/ Color3(ZeroInitT = ZeroInit)
             /** @todoc remove workaround when doxygen is sane */
             #ifndef DOXYGEN_GENERATING_OUTPUT
-            : Vector3<T>{ZeroInit}
+            /* MSVC 2015 can't handle {} here */
+            : Vector3<T>(ZeroInit)
             #endif
             {}
 
@@ -264,7 +265,8 @@ template<class T> class Color3: public Vector3<T> {
         explicit Color3(NoInitT)
             /** @todoc remove workaround when doxygen is sane */
             #ifndef DOXYGEN_GENERATING_OUTPUT
-            : Vector3<T>{NoInit}
+            /* MSVC 2015 can't handle {} here */
+            : Vector3<T>(NoInit)
             #endif
             {}
 
@@ -452,7 +454,8 @@ class Color4: public Vector4<T> {
         constexpr explicit Color4(ZeroInitT)
             /** @todoc remove workaround when doxygen is sane */
             #ifndef DOXYGEN_GENERATING_OUTPUT
-            : Vector4<T>{ZeroInit}
+            /* MSVC 2015 can't handle {} here */
+            : Vector4<T>(ZeroInit)
             #endif
             {}
 
@@ -460,7 +463,8 @@ class Color4: public Vector4<T> {
         explicit Color4(NoInitT)
             /** @todoc remove workaround when doxygen is sane */
             #ifndef DOXYGEN_GENERATING_OUTPUT
-            : Vector4<T>{NoInit}
+            /* MSVC 2015 can't handle {} here */
+            : Vector4<T>(NoInit)
             #endif
             {}
 
diff --git a/src/Magnum/Math/RectangularMatrix.h b/src/Magnum/Math/RectangularMatrix.h
index abc5c9ae1..3da20b600 100644
--- a/src/Magnum/Math/RectangularMatrix.h
+++ b/src/Magnum/Math/RectangularMatrix.h
@@ -379,7 +379,8 @@ template<std::size_t cols, std::size_t rows, class T> class RectangularMatrix {
         template<class U, std::size_t ...sequence> constexpr explicit RectangularMatrix(Implementation::Sequence<sequence...>, const RectangularMatrix<cols, rows, U>& matrix): _data{Vector<rows, T>(matrix[sequence])...} {}
 
         /* Implementation for RectangularMatrix<cols, rows, T>::RectangularMatrix(ZeroInitT) and RectangularMatrix<cols, rows, T>::RectangularMatrix(NoInitT) */
-        template<class U, std::size_t ...sequence> constexpr explicit RectangularMatrix(Implementation::Sequence<sequence...>, U): _data{Vector<rows, T>{(static_cast<void>(sequence), U{})}...} {}
+        /* MSVC 2015 can't handle {} here */
+        template<class U, std::size_t ...sequence> constexpr explicit RectangularMatrix(Implementation::Sequence<sequence...>, U): _data{Vector<rows, T>((static_cast<void>(sequence), U{}))...} {}
 
         template<std::size_t ...sequence> constexpr Vector<DiagonalSize, T> diagonalInternal(Implementation::Sequence<sequence...>) const;
 
diff --git a/src/Magnum/SceneGraph/Camera.h b/src/Magnum/SceneGraph/Camera.h
index 0569e3eac..439c512ad 100644
--- a/src/Magnum/SceneGraph/Camera.h
+++ b/src/Magnum/SceneGraph/Camera.h
@@ -106,7 +106,8 @@ template<UnsignedInt dimensions, class T> class Camera: public AbstractFeature<d
         #ifndef DOXYGEN_GENERATING_OUTPUT
         /* This is here to avoid ambiguity with deleted copy constructor when
            passing `*this` from class subclassing both Camera and AbstractObject */
-        template<class U, class = typename std::enable_if<std::is_base_of<AbstractObject<dimensions, T>, U>::value>::type> Camera(U& object): Camera<dimensions, T>{static_cast<AbstractObject<dimensions, T>&>(object)} {}
+        /* MSVC 2015 can't handle {} here */
+        template<class U, class = typename std::enable_if<std::is_base_of<AbstractObject<dimensions, T>, U>::value>::type> Camera(U& object): Camera<dimensions, T>(static_cast<AbstractObject<dimensions, T>&>(object)) {}
         #endif
 
         ~Camera();