From 77fbed450e775449287c1800df27dcb00a7bef81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 13 Nov 2013 13:40:53 +0100 Subject: [PATCH] GCC 4.6 compatibility: apparently can't list-initialize a structure. --- src/Plugins/MagnumFont/MagnumFont.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Plugins/MagnumFont/MagnumFont.cpp b/src/Plugins/MagnumFont/MagnumFont.cpp index 811f2a2cd..4bfd97c61 100644 --- a/src/Plugins/MagnumFont/MagnumFont.cpp +++ b/src/Plugins/MagnumFont/MagnumFont.cpp @@ -36,6 +36,10 @@ namespace Magnum { namespace Text { struct MagnumFont::Data { + #ifdef CORRADE_GCC46_COMPATIBILITY + explicit Data(Utility::Configuration&& conf, Trade::ImageData2D&& image, std::unordered_map&& glyphId, std::vector&& glyphAdvance): conf(std::move(conf)), image(std::move(image)), glyphId(std::move(glyphId)), glyphAdvance(std::move(glyphAdvance)) {} + #endif + Utility::Configuration conf; Trade::ImageData2D image; std::unordered_map glyphId;