From 614c61e8e32431689388ce020f8320311ddaae83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 28 Apr 2015 22:00:23 +0200 Subject: [PATCH] GCC 4.6 compatibility: no non-static member initializers. --- src/Magnum/Implementation/FramebufferState.cpp | 5 ++++- src/Magnum/Implementation/FramebufferState.h | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Magnum/Implementation/FramebufferState.cpp b/src/Magnum/Implementation/FramebufferState.cpp index b10210775..38bd38540 100644 --- a/src/Magnum/Implementation/FramebufferState.cpp +++ b/src/Magnum/Implementation/FramebufferState.cpp @@ -33,7 +33,10 @@ namespace Magnum { namespace Implementation { -constexpr const Range2Di FramebufferState::DisengagedViewport; +#ifndef CORRADE_GCC46_COMPATIBILITY +constexpr +#endif +const Range2Di FramebufferState::DisengagedViewport{{}, {-1, -1}}; FramebufferState::FramebufferState(Context& context, std::vector& extensions): readBinding{0}, drawBinding{0}, renderbufferBinding{0}, maxDrawBuffers{0}, maxColorAttachments{0}, maxRenderbufferSize{0}, maxSamples{0}, #ifndef MAGNUM_TARGET_GLES diff --git a/src/Magnum/Implementation/FramebufferState.h b/src/Magnum/Implementation/FramebufferState.h index 72505d719..cc0c9c932 100644 --- a/src/Magnum/Implementation/FramebufferState.h +++ b/src/Magnum/Implementation/FramebufferState.h @@ -43,7 +43,11 @@ namespace Magnum { namespace Implementation { struct FramebufferState { - constexpr static const Range2Di DisengagedViewport{{}, {-1, -1}}; + /* Also, GCC 4.6 doesn't have non-static member initializers */ + #ifndef CORRADE_GCC46_COMPATIBILITY + constexpr + #endif + static const Range2Di DisengagedViewport; explicit FramebufferState(Context& context, std::vector& extensions);