From d6ec3985392832d0f5e6cd2e0a2133d87dce6711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 7 Jul 2013 11:38:34 +0200
Subject: [PATCH] GCC 4.4 compatibility: some explicit typing needed.

---
 src/Primitives/Crosshair.cpp | 4 ++--
 src/Primitives/Cube.cpp      | 6 +++---
 src/Primitives/Icosphere.cpp | 2 +-
 src/Primitives/Line.cpp      | 4 ++--
 src/Primitives/Plane.cpp     | 6 +++---
 src/Primitives/Square.cpp    | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Primitives/Crosshair.cpp b/src/Primitives/Crosshair.cpp
index a03aa2292..f762364c8 100644
--- a/src/Primitives/Crosshair.cpp
+++ b/src/Primitives/Crosshair.cpp
@@ -31,14 +31,14 @@
 namespace Magnum { namespace Primitives {
 
 Trade::MeshData2D Crosshair2D::wireframe() {
-    return Trade::MeshData2D(Mesh::Primitive::Lines, {}, {{
+    return Trade::MeshData2D(Mesh::Primitive::Lines, {}, {std::vector<Vector2>{
         {-1.0f,  0.0f}, {1.0f, 0.0f},
         { 0.0f, -1.0f}, {0.0f, 1.0f}
     }}, {});
 }
 
 Trade::MeshData3D Crosshair3D::wireframe() {
-    return Trade::MeshData3D(Mesh::Primitive::Lines, {}, {{
+    return Trade::MeshData3D(Mesh::Primitive::Lines, {}, {std::vector<Vector3>{
         {-1.0f,  0.0f,  0.0f}, {1.0f, 0.0f, 0.0f},
         { 0.0f, -1.0f,  0.0f}, {0.0f, 1.0f, 0.0f},
         { 0.0f,  0.0f, -1.0f}, {0.0f, 0.0f, 1.0f}
diff --git a/src/Primitives/Cube.cpp b/src/Primitives/Cube.cpp
index 084a2e9b2..fe6c120d4 100644
--- a/src/Primitives/Cube.cpp
+++ b/src/Primitives/Cube.cpp
@@ -37,7 +37,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 */
-    }, {{
+    }, {std::vector<Vector3>{
         {-1.0f, -1.0f,  1.0f},
         { 1.0f, -1.0f,  1.0f},
         { 1.0f,  1.0f,  1.0f}, /* +Z */
@@ -67,7 +67,7 @@ Trade::MeshData3D Cube::solid() {
         {-1.0f, -1.0f,  1.0f},
         {-1.0f,  1.0f,  1.0f}, /* -X */
         {-1.0f,  1.0f, -1.0f}
-    }}, {{
+    }}, {std::vector<Vector3>{
         { 0.0f,  0.0f,  1.0f},
         { 0.0f,  0.0f,  1.0f},
         { 0.0f,  0.0f,  1.0f}, /* +Z */
@@ -106,7 +106,7 @@ Trade::MeshData3D Cube::wireframe() {
         4, 5, 5, 6, 6, 7, 7, 4, /* -Z */
         1, 5, 2, 6,             /* +X */
         0, 4, 3, 7              /* -X */
-    }, {{
+    }, {std::vector<Vector3>{
         {-1.0f, -1.0f,  1.0f},
         { 1.0f, -1.0f,  1.0f},
         { 1.0f,  1.0f,  1.0f},
diff --git a/src/Primitives/Icosphere.cpp b/src/Primitives/Icosphere.cpp
index 56a10f776..70b352666 100644
--- a/src/Primitives/Icosphere.cpp
+++ b/src/Primitives/Icosphere.cpp
@@ -49,7 +49,7 @@ Icosphere<0>::Icosphere(): MeshData3D(Mesh::Primitive::Triangles, {
     7, 1, 0,
     3, 9, 8,
     4, 8, 0
-}, {}, {{
+}, {}, {std::vector<Vector3>{
     {0.0f, -0.525731f, 0.850651f},
     {0.850651f, 0.0f, 0.525731f},
     {0.850651f, 0.0f, -0.525731f},
diff --git a/src/Primitives/Line.cpp b/src/Primitives/Line.cpp
index fc0da8207..3e946cf2e 100644
--- a/src/Primitives/Line.cpp
+++ b/src/Primitives/Line.cpp
@@ -31,13 +31,13 @@
 namespace Magnum { namespace Primitives {
 
 Trade::MeshData2D Line2D::wireframe() {
-    return Trade::MeshData2D(Mesh::Primitive::Lines, {}, {{
+    return Trade::MeshData2D(Mesh::Primitive::Lines, {}, {std::vector<Vector2>{
         {0.0f, 0.0f}, {1.0f, 0.0f}
     }}, {});
 }
 
 Trade::MeshData3D Line3D::wireframe() {
-    return Trade::MeshData3D(Mesh::Primitive::Lines, {}, {{
+    return Trade::MeshData3D(Mesh::Primitive::Lines, {}, {std::vector<Vector3>{
         {0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 0.0f},
     }}, {}, {});
 }
diff --git a/src/Primitives/Plane.cpp b/src/Primitives/Plane.cpp
index d3fe3787e..f0323187f 100644
--- a/src/Primitives/Plane.cpp
+++ b/src/Primitives/Plane.cpp
@@ -30,12 +30,12 @@
 namespace Magnum { namespace Primitives {
 
 Trade::MeshData3D Plane::solid() {
-    return Trade::MeshData3D(Mesh::Primitive::TriangleStrip, {}, {{
+    return Trade::MeshData3D(Mesh::Primitive::TriangleStrip, {}, {std::vector<Vector3>{
         {1.0f, -1.0f, 0.0f},
         {1.0f, 1.0f, 0.0f},
         {-1.0f, -1.0f, 0.0f},
         {-1.0f, 1.0f, 0.0f}
-    }}, {{
+    }}, {std::vector<Vector3>{
         {0.0f, 0.0f, 1.0f},
         {0.0f, 0.0f, 1.0f},
         {0.0f, 0.0f, 1.0f},
@@ -44,7 +44,7 @@ Trade::MeshData3D Plane::solid() {
 }
 
 Trade::MeshData3D Plane::wireframe() {
-    return Trade::MeshData3D(Mesh::Primitive::LineLoop, {}, {{
+    return Trade::MeshData3D(Mesh::Primitive::LineLoop, {}, {std::vector<Vector3>{
         {-1.0f, -1.0f, 0.0f},
         {1.0f, -1.0f, 0.0f},
         {1.0f, 1.0f, 0.0f},
diff --git a/src/Primitives/Square.cpp b/src/Primitives/Square.cpp
index e5bfda106..fdab9b921 100644
--- a/src/Primitives/Square.cpp
+++ b/src/Primitives/Square.cpp
@@ -30,7 +30,7 @@
 namespace Magnum { namespace Primitives {
 
 Trade::MeshData2D Square::solid() {
-    return Trade::MeshData2D(Mesh::Primitive::TriangleStrip, {}, {{
+    return Trade::MeshData2D(Mesh::Primitive::TriangleStrip, {}, {std::vector<Vector2>{
         {1.0f, -1.0f},
         {1.0f, 1.0f},
         {-1.0f, -1.0f},
@@ -39,7 +39,7 @@ Trade::MeshData2D Square::solid() {
 }
 
 Trade::MeshData2D Square::wireframe() {
-    return Trade::MeshData2D(Mesh::Primitive::LineLoop, {}, {{
+    return Trade::MeshData2D(Mesh::Primitive::LineLoop, {}, {std::vector<Vector2>{
         {-1.0f, -1.0f},
         {1.0f, -1.0f},
         {1.0f, 1.0f},