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 DistanceFieldVector::DistanceFieldV .addSource(rs.get(vertexShaderName())); vert.addSource(rs.get("DistanceFieldVector.frag")); - CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile({frag, vert})); + /* GCC 4.5: the same issue */ + std::initializer_list> 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 Flat::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> 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 Vector::Vector(): transformationPro .addSource(rs.get(vertexShaderName())); frag.addSource(rs.get("Vector.frag")); - CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile({vert, frag})); + /* GCC 4.5: the same issue */ + std::initializer_list> 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 VertexColor::VertexColor(): transfo .addSource(rs.get(vertexShaderName())); frag.addSource(rs.get("VertexColor.frag")); - CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile({vert, frag})); + /* GCC 4.5: the same issue */ + std::initializer_list> ss{frag, vert}; + CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile(ss)); attachShader(vert); attachShader(frag);