Browse Source

GCC 4.5 compatibility: no forward enum declarations.

Vladimír Vondruš 13 years ago
parent
commit
ead852b102
  1. 4
      src/AbstractFramebuffer.h
  2. 4
      src/AbstractImage.h
  3. 5
      src/AbstractTexture.h
  4. 8
      src/Magnum.h
  5. 4
      src/Renderbuffer.h

4
src/AbstractFramebuffer.h

@ -33,6 +33,10 @@
#include "Math/Geometry/Rectangle.h" #include "Math/Geometry/Rectangle.h"
#include "Buffer.h" #include "Buffer.h"
#ifdef CORRADE_GCC45_COMPATIBILITY
#include "ImageFormat.h"
#endif
namespace Magnum { namespace Magnum {
/** /**

4
src/AbstractImage.h

@ -33,6 +33,10 @@
#include "Magnum.h" #include "Magnum.h"
#include "magnumVisibility.h" #include "magnumVisibility.h"
#ifdef CORRADE_GCC45_COMPATIBILITY
#include "ImageFormat.h"
#endif
namespace Magnum { namespace Magnum {
/** /**

5
src/AbstractTexture.h

@ -35,6 +35,11 @@
#include "Color.h" #include "Color.h"
#include "Sampler.h" #include "Sampler.h"
#ifdef CORRADE_GCC45_COMPATIBILITY
#include "ImageFormat.h"
#include "TextureFormat.h"
#endif
namespace Magnum { namespace Magnum {
/** /**

8
src/Magnum.h

@ -357,8 +357,10 @@ typedef BufferImage<3> BufferImage3D;
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
class BufferTexture; class BufferTexture;
#ifndef CORRADE_GCC45_COMPATIBILITY
enum class BufferTextureFormat: GLenum; enum class BufferTextureFormat: GLenum;
#endif #endif
#endif
template<class T = Float> class Color3; template<class T = Float> class Color3;
template<class T = Float> class Color4; template<class T = Float> class Color4;
@ -385,8 +387,10 @@ typedef Image<1> Image1D;
typedef Image<2> Image2D; typedef Image<2> Image2D;
typedef Image<3> Image3D; typedef Image<3> Image3D;
#ifndef CORRADE_GCC45_COMPATIBILITY
enum class ImageFormat: GLenum; enum class ImageFormat: GLenum;
enum class ImageType: GLenum; enum class ImageType: GLenum;
#endif
template<UnsignedInt> class ImageWrapper; template<UnsignedInt> class ImageWrapper;
typedef ImageWrapper<1> ImageWrapper1D; typedef ImageWrapper<1> ImageWrapper1D;
@ -401,7 +405,9 @@ class SampleQuery;
class TimeQuery; class TimeQuery;
class Renderbuffer; class Renderbuffer;
#ifndef CORRADE_GCC45_COMPATIBILITY
enum class RenderbufferFormat: GLenum; enum class RenderbufferFormat: GLenum;
#endif
#ifndef CORRADE_GCC45_COMPATIBILITY #ifndef CORRADE_GCC45_COMPATIBILITY
enum class ResourceState: UnsignedByte; enum class ResourceState: UnsignedByte;
@ -422,7 +428,9 @@ typedef Texture<1> Texture1D;
typedef Texture<2> Texture2D; typedef Texture<2> Texture2D;
typedef Texture<3> Texture3D; typedef Texture<3> Texture3D;
#ifndef CORRADE_GCC45_COMPATIBILITY
enum class TextureFormat: GLenum; enum class TextureFormat: GLenum;
#endif
class Timeline; class Timeline;
#endif #endif

4
src/Renderbuffer.h

@ -32,6 +32,10 @@
#include "OpenGL.h" #include "OpenGL.h"
#include "magnumVisibility.h" #include "magnumVisibility.h"
#ifdef CORRADE_GCC45_COMPATIBILITY
#include "RenderbufferFormat.h"
#endif
namespace Magnum { namespace Magnum {
/** /**

Loading…
Cancel
Save