diff --git a/src/Magnum/Primitives/Cube.cpp b/src/Magnum/Primitives/Cube.cpp index 4d0259608..bd1be1e33 100644 --- a/src/Magnum/Primitives/Cube.cpp +++ b/src/Magnum/Primitives/Cube.cpp @@ -39,6 +39,7 @@ Trade::MeshData3D Cube::solid() { 12, 13, 14, 12, 14, 15, /* -Z */ 16, 17, 18, 16, 18, 19, /* -Y */ 20, 21, 22, 20, 22, 23 /* -X */ + /* GCC 4.4 needs explicit typing */ }, {std::vector{ {-1.0f, -1.0f, 1.0f}, { 1.0f, -1.0f, 1.0f}, @@ -69,6 +70,7 @@ Trade::MeshData3D Cube::solid() { {-1.0f, -1.0f, 1.0f}, {-1.0f, 1.0f, 1.0f}, /* -X */ {-1.0f, 1.0f, -1.0f} + /* GCC 4.4 needs explicit typing */ }}, {std::vector{ { 0.0f, 0.0f, 1.0f}, { 0.0f, 0.0f, 1.0f}, @@ -126,7 +128,8 @@ Trade::MeshData3D Cube::solidStrip() { |F \| 2---3 */ - return Trade::MeshData3D(MeshPrimitive::TriangleStrip, {}, {{ + /* GCC 4.4 needs explicit typing */ + return Trade::MeshData3D(MeshPrimitive::TriangleStrip, {}, {std::vector{ { 1.0f, 1.0f, 1.0f}, /* 3 */ {-1.0f, 1.0f, 1.0f}, /* 2 */ { 1.0f, -1.0f, 1.0f}, /* 6 */ @@ -150,6 +153,7 @@ Trade::MeshData3D Cube::wireframe() { 4, 5, 5, 6, 6, 7, 7, 4, /* -Z */ 1, 5, 2, 6, /* +X */ 0, 4, 3, 7 /* -X */ + /* GCC 4.4 needs explicit typing */ }, {std::vector{ {-1.0f, -1.0f, 1.0f}, { 1.0f, -1.0f, 1.0f}, diff --git a/src/Magnum/Test/TransformFeedbackGLTest.cpp b/src/Magnum/Test/TransformFeedbackGLTest.cpp index 194011547..b68858014 100644 --- a/src/Magnum/Test/TransformFeedbackGLTest.cpp +++ b/src/Magnum/Test/TransformFeedbackGLTest.cpp @@ -318,8 +318,13 @@ void TransformFeedbackGLTest::attachRanges() { TransformFeedback feedback; feedback.attachBuffers(0, { + #ifndef CORRADE_GCC44_COMPATIBILITY std::make_tuple(&output1, 256, 2*sizeof(Vector2)), std::make_tuple(&output2, 512, 2*sizeof(Float)) + #else + std::tuple(&output1, 256, 2*sizeof(Vector2)), + std::tuple(&output2, 512, 2*sizeof(Float)) + #endif }); MAGNUM_VERIFY_NO_ERROR();