From e49136fd2406f295dc770f177ad29c331b2c660f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 28 Sep 2019 20:16:54 +0200 Subject: [PATCH] GL: I *knew* there was a reason I did this. --- src/Magnum/GL/PixelFormat.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Magnum/GL/PixelFormat.cpp b/src/Magnum/GL/PixelFormat.cpp index c04377a8d..10e32a831 100644 --- a/src/Magnum/GL/PixelFormat.cpp +++ b/src/Magnum/GL/PixelFormat.cpp @@ -42,8 +42,9 @@ constexpr struct { PixelType type; } FormatMapping[] { #define _c(input, format, type, textureFormat) {PixelFormat::format, PixelType::type}, + /* GCC 4.8 doesn't like just a {} for default enum values */ #define _n(input, format, type) {PixelFormat::format, PixelType::type}, - #define _s(input) {{}, {}}, + #define _s(input) {PixelFormat{}, PixelType{}}, #include "Magnum/GL/Implementation/pixelFormatMapping.hpp" #undef _s #undef _n @@ -52,8 +53,9 @@ constexpr struct { constexpr TextureFormat TextureFormatMapping[] { #define _c(input, format, type, textureFormat) TextureFormat::textureFormat, - #define _n(input, format, type) {}, - #define _s(input) {}, + /* GCC 4.8 doesn't like just a {} for default enum values */ + #define _n(input, format, type) TextureFormat{}, + #define _s(input) TextureFormat{}, #include "Magnum/GL/Implementation/pixelFormatMapping.hpp" #undef _s #undef _n