From 9d0fc0d9d3470dabbecad7fa58a250790faab31e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 9 Apr 2014 00:16:58 +0200
Subject: [PATCH] GCC 4.5 compatibility: cannot deduce init list in templated
 function.

---
 src/Magnum/Shaders/DistanceFieldVector.cpp | 4 +++-
 src/Magnum/Shaders/Flat.cpp                | 4 +++-
 src/Magnum/Shaders/Vector.cpp              | 4 +++-
 src/Magnum/Shaders/VertexColor.cpp         | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Magnum/Shaders/DistanceFieldVector.cpp b/src/Magnum/Shaders/DistanceFieldVector.cpp
index 31cfceb6d..911b1d750 100644
--- a/src/Magnum/Shaders/DistanceFieldVector.cpp
+++ b/src/Magnum/Shaders/DistanceFieldVector.cpp
@@ -60,7 +60,9 @@ template<UnsignedInt dimensions> DistanceFieldVector<dimensions>::DistanceFieldV
         .addSource(rs.get(vertexShaderName<dimensions>()));
     vert.addSource(rs.get("DistanceFieldVector.frag"));
 
-    CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile({frag, vert}));
+    /* GCC 4.5: the same issue */
+    std::initializer_list<std::reference_wrapper<Shader>> ss{frag, vert};
+    CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile(ss));
 
     AbstractShaderProgram::attachShader(frag);
     AbstractShaderProgram::attachShader(vert);
diff --git a/src/Magnum/Shaders/Flat.cpp b/src/Magnum/Shaders/Flat.cpp
index 43fee89a8..2e1735fcb 100644
--- a/src/Magnum/Shaders/Flat.cpp
+++ b/src/Magnum/Shaders/Flat.cpp
@@ -65,7 +65,9 @@ template<UnsignedInt dimensions> Flat<dimensions>::Flat(const Flags flags): tran
     frag.addSource(flags & Flag::Textured ? "#define TEXTURED\n" : "")
         .addSource(rs.get("Flat.frag"));
 
-    CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile({vert, frag}));
+    /* GCC 4.5: the same issue */
+    std::initializer_list<std::reference_wrapper<Shader>> ss{frag, vert};
+    CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile(ss));
 
     attachShader(vert);
     attachShader(frag);
diff --git a/src/Magnum/Shaders/Vector.cpp b/src/Magnum/Shaders/Vector.cpp
index c42bbdadb..2b1d932b3 100644
--- a/src/Magnum/Shaders/Vector.cpp
+++ b/src/Magnum/Shaders/Vector.cpp
@@ -60,7 +60,9 @@ template<UnsignedInt dimensions> Vector<dimensions>::Vector(): transformationPro
         .addSource(rs.get(vertexShaderName<dimensions>()));
     frag.addSource(rs.get("Vector.frag"));
 
-    CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile({vert, frag}));
+    /* GCC 4.5: the same issue */
+    std::initializer_list<std::reference_wrapper<Shader>> ss{frag, vert};
+    CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile(ss));
 
     AbstractShaderProgram::attachShader(vert);
     AbstractShaderProgram::attachShader(frag);
diff --git a/src/Magnum/Shaders/VertexColor.cpp b/src/Magnum/Shaders/VertexColor.cpp
index 0eb9306a1..765e3f222 100644
--- a/src/Magnum/Shaders/VertexColor.cpp
+++ b/src/Magnum/Shaders/VertexColor.cpp
@@ -68,7 +68,9 @@ template<UnsignedInt dimensions> VertexColor<dimensions>::VertexColor(): transfo
         .addSource(rs.get(vertexShaderName<dimensions>()));
     frag.addSource(rs.get("VertexColor.frag"));
 
-    CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile({vert, frag}));
+    /* GCC 4.5: the same issue */
+    std::initializer_list<std::reference_wrapper<Shader>> ss{frag, vert};
+    CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile(ss));
 
     attachShader(vert);
     attachShader(frag);