From e5394fb838dac62638981c52189abc553b9a1513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 7 Jul 2013 11:07:58 +0200 Subject: [PATCH] GCC 4.5 compatibility: more nullptr-related issues. --- src/Text/Test/AbstractFontConverterTest.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Text/Test/AbstractFontConverterTest.cpp b/src/Text/Test/AbstractFontConverterTest.cpp index e7d3e2f7b..f772c2dd5 100644 --- a/src/Text/Test/AbstractFontConverterTest.cpp +++ b/src/Text/Test/AbstractFontConverterTest.cpp @@ -72,7 +72,11 @@ void AbstractFontConverterTest::convertGlyphs() { Containers::Array doExportFontToSingleData(AbstractFont*, GlyphCache*, const std::u32string& characters) const override { this->characters = characters; + #ifndef CORRADE_GCC45_COMPATIBILITY return nullptr; + #else + return {}; + #endif } std::u32string& characters;