From 5a84d4d572f48627cbd2ac593c156f7de4085bd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 12 Dec 2013 20:24:09 +0100 Subject: [PATCH] GCC 4.5 compatibility: no forward declarations for enums. --- src/Magnum.h | 3 ++- src/Trade/MeshData2D.h | 4 ++++ src/Trade/MeshData3D.h | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Magnum.h b/src/Magnum.h index fbd020fbb..e5fb3e8ab 100644 --- a/src/Magnum.h +++ b/src/Magnum.h @@ -589,8 +589,9 @@ typedef ImageReference<1> ImageReference1D; typedef ImageReference<2> ImageReference2D; typedef ImageReference<3> ImageReference3D; +#ifndef CORRADE_GCC45_COMPATIBILITY enum class MeshPrimitive: GLenum; - +#endif class Mesh; class MeshView; diff --git a/src/Trade/MeshData2D.h b/src/Trade/MeshData2D.h index a064977cb..25f901687 100644 --- a/src/Trade/MeshData2D.h +++ b/src/Trade/MeshData2D.h @@ -34,6 +34,10 @@ #include "magnumVisibility.h" +#ifdef CORRADE_GCC45_COMPATIBILITY +#include "Mesh.h" +#endif + namespace Magnum { namespace Trade { /** diff --git a/src/Trade/MeshData3D.h b/src/Trade/MeshData3D.h index d1440affb..a1821dfa6 100644 --- a/src/Trade/MeshData3D.h +++ b/src/Trade/MeshData3D.h @@ -34,6 +34,10 @@ #include "magnumVisibility.h" +#ifdef CORRADE_GCC45_COMPATIBILITY +#include "Mesh.h" +#endif + namespace Magnum { namespace Trade { /**