Browse Source

GCC 4.6 compatibility: apparently can't list-initialize a structure.

pull/34/head
Vladimír Vondruš 13 years ago
parent
commit
77fbed450e
  1. 4
      src/Plugins/MagnumFont/MagnumFont.cpp

4
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<char32_t, UnsignedInt>&& glyphId, std::vector<Vector2>&& 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<char32_t, UnsignedInt> glyphId;

Loading…
Cancel
Save