Browse Source

GCC 4.5 compatibility: cannot deduce init list in templated function.

Vladimír Vondruš 12 years ago
parent
commit
9d0fc0d9d3
  1. 4
      src/Magnum/Shaders/DistanceFieldVector.cpp
  2. 4
      src/Magnum/Shaders/Flat.cpp
  3. 4
      src/Magnum/Shaders/Vector.cpp
  4. 4
      src/Magnum/Shaders/VertexColor.cpp

4
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);

4
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);

4
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);

4
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);

Loading…
Cancel
Save