From 6f2485a3261d0f9fc3ba21c7ba66d2bac1901fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 5 Dec 2013 00:35:10 +0100 Subject: [PATCH] MSVC 2013 compatibility: no Unicode character/string literals. --- src/Text/Test/AbstractFontConverterTest.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Text/Test/AbstractFontConverterTest.cpp b/src/Text/Test/AbstractFontConverterTest.cpp index b3356d192..22b04cd71 100644 --- a/src/Text/Test/AbstractFontConverterTest.cpp +++ b/src/Text/Test/AbstractFontConverterTest.cpp @@ -103,8 +103,11 @@ void AbstractFontConverterTest::convertGlyphs() { #endif GlyphExporter exporter(characters); exporter.exportFontToSingleData(*static_cast(nullptr), *static_cast(nullptr), "abC01a0 "); - #ifndef __MINGW32__ + #if !defined(__MINGW32__) && !defined(CORRADE_MSVC2013_COMPATIBILITY) CORRADE_COMPARE(characters, U" 01Cab"); + #elif defined(CORRADE_MSVC2013_COMPATIBILITY) + CORRADE_COMPARE(characters, (std::u32string{ + ' ', '0', '1', 'C', 'a', 'b'})); #else CORRADE_COMPARE(characters, (std::vector{ U' ', U'0', U'1', U'C', U'a', U'b'}));