From 9eb3fd00ad19b881cba2e79983171f56c0ef64f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 24 May 2014 21:11:46 +0200 Subject: [PATCH] GCC 4.5 / MSVC 2013 compatibility: constexpr-related issues. Blind fix, copied from surrounding code. --- src/Magnum/AbstractShaderProgram.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Magnum/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h index 16fa5c9a0..bcfe2117a 100644 --- a/src/Magnum/AbstractShaderProgram.h +++ b/src/Magnum/AbstractShaderProgram.h @@ -1421,7 +1421,12 @@ template<> struct Attribute>: SizedAttribute<1, 3> { UnsignedInt10f11f11fRev = GL_UNSIGNED_INT_10F_11F_11F_REV #endif }; - constexpr static DataType DefaultDataType = DataType::Float; + #if !defined(CORRADE_GCC45_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY) + constexpr static + #else + static const + #endif + DataType DefaultDataType = DataType::Float; typedef FloatAttribute::DataOption DataOption; typedef FloatAttribute::DataOptions DataOptions;