Browse Source

GCC 4.4 compatibility: some explicit typing needed.

Vladimír Vondruš 13 years ago
parent
commit
aff9463fa0
  1. 2
      src/Text/Test/AbstractFontConverterTest.cpp
  2. 2
      src/Text/Test/AbstractFontTest.cpp
  3. 2
      src/Text/Test/GlyphCacheGLTest.cpp

2
src/Text/Test/AbstractFontConverterTest.cpp

@ -213,7 +213,7 @@ void AbstractFontConverterTest::importGlyphCacheFromSingleData() {
/* doImportFromData() should call doImportFromSingleData() */
SingleGlyphCacheDataImporter importer;
const unsigned char data[] = {0xa5};
GlyphCache* cache = importer.importGlyphCacheFromData({{{}, data}});
GlyphCache* cache = importer.importGlyphCacheFromData(std::vector<std::pair<std::string, Containers::ArrayReference<const unsigned char>>>{{{}, data}});
CORRADE_COMPARE(cache, reinterpret_cast<GlyphCache*>(0xdeadbeef));
}

2
src/Text/Test/AbstractFontTest.cpp

@ -77,7 +77,7 @@ void AbstractFontTest::openSingleData() {
SingleDataFont font;
const unsigned char data[] = {0xa5};
CORRADE_VERIFY(!font.isOpened());
font.openData({{{}, data}}, 3.0f);
font.openData(std::vector<std::pair<std::string, Containers::ArrayReference<const unsigned char>>>{{{}, data}}, 3.0f);
CORRADE_VERIFY(font.isOpened());
}

2
src/Text/Test/GlyphCacheGLTest.cpp

@ -84,7 +84,7 @@ void GlyphCacheGLTest::reserve() {
Text::GlyphCache cache(Vector2i(236));
/* Verify that this works for "empty" cache */
CORRADE_VERIFY(!cache.reserve({{5, 3}}).empty());
CORRADE_VERIFY(!cache.reserve(std::vector<Vector2i>{{5, 3}}).empty());
}
}}}

Loading…
Cancel
Save