diff --git a/src/Plugins/MagnumFont/MagnumFont.cpp b/src/Plugins/MagnumFont/MagnumFont.cpp index aca408387..811f2a2cd 100644 --- a/src/Plugins/MagnumFont/MagnumFont.cpp +++ b/src/Plugins/MagnumFont/MagnumFont.cpp @@ -157,7 +157,11 @@ std::pair MagnumFont::openInternal(Utility::Configuration&& conf, for(const Utility::ConfigurationGroup* const c: chars) { const UnsignedInt glyphId = c->value("glyph"); CORRADE_INTERNAL_ASSERT(glyphId < _opened->glyphAdvance.size()); + #ifndef CORRADE_GCC46_COMPATIBILITY _opened->glyphId.emplace(c->value("unicode"), glyphId); + #else + _opened->glyphId.insert({c->value("unicode"), glyphId}); + #endif } return {_opened->conf.value("fontSize"), _opened->conf.value("lineHeight")}; diff --git a/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp b/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp index 1e6f381b2..8bea885a8 100644 --- a/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp +++ b/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp @@ -63,9 +63,17 @@ std::vector>> MagnumFont should stay at position 0 */ std::unordered_map glyphIdMap; glyphIdMap.reserve(cache.glyphCount()); + #ifndef CORRADE_GCC46_COMPATIBILITY glyphIdMap.emplace(0, 0); + #else + glyphIdMap.insert({0, 0}); + #endif for(const std::pair>& glyph: cache) + #ifndef CORRADE_GCC46_COMPATIBILITY glyphIdMap.emplace(glyph.first, glyphIdMap.size()); + #else + glyphIdMap.insert({glyph.first, glyphIdMap.size()}); + #endif /** @todo Save only glyphs contained in @p characters */