From 53c0f517b172295c80f399353144fcf915d6b67e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 2 Dec 2013 15:51:39 +0100 Subject: [PATCH] GCC 4.5 compatibility: no forward declarations for enums. --- src/AbstractFramebuffer.h | 1 + src/AbstractTexture.h | 1 + src/Magnum.h | 2 ++ src/MeshTools/CompressIndices.h | 4 ++++ 4 files changed, 8 insertions(+) diff --git a/src/AbstractFramebuffer.h b/src/AbstractFramebuffer.h index 15e57968f..e5a28be90 100644 --- a/src/AbstractFramebuffer.h +++ b/src/AbstractFramebuffer.h @@ -35,6 +35,7 @@ #include "OpenGL.h" #ifdef CORRADE_GCC45_COMPATIBILITY +#include "Buffer.h" #include "ImageFormat.h" #endif diff --git a/src/AbstractTexture.h b/src/AbstractTexture.h index 428d4ef83..8d1d3c602 100644 --- a/src/AbstractTexture.h +++ b/src/AbstractTexture.h @@ -33,6 +33,7 @@ #include "Sampler.h" #ifdef CORRADE_GCC45_COMPATIBILITY +#include "Buffer.h" #include "ImageFormat.h" #include "TextureFormat.h" #endif diff --git a/src/Magnum.h b/src/Magnum.h index cec3be3a0..242e97ba5 100644 --- a/src/Magnum.h +++ b/src/Magnum.h @@ -527,7 +527,9 @@ template class Array1D; template class Array2D; template class Array3D; +#ifndef CORRADE_GCC45_COMPATIBILITY enum class BufferUsage: GLenum; +#endif class Buffer; #ifndef MAGNUM_TARGET_GLES2 diff --git a/src/MeshTools/CompressIndices.h b/src/MeshTools/CompressIndices.h index 43ef9ae2e..54d53d6ba 100644 --- a/src/MeshTools/CompressIndices.h +++ b/src/MeshTools/CompressIndices.h @@ -32,6 +32,10 @@ #include "Mesh.h" +#ifdef CORRADE_GCC45_COMPATIBILITY +#include "Buffer.h" +#endif + #include "magnumMeshToolsVisibility.h" namespace Magnum { namespace MeshTools {