From e78a0ea7ea7a88a181b0d88b88a13cbf24b9b8b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 25 Jul 2018 23:39:33 +0200 Subject: [PATCH] AnyImageImporter: work around GCC 4.7 shittiness. It can't handle raw string literals inside macros. Heh. --- .../AnyImageImporter/Test/AnyImageImporterTest.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/MagnumPlugins/AnyImageImporter/Test/AnyImageImporterTest.cpp b/src/MagnumPlugins/AnyImageImporter/Test/AnyImageImporterTest.cpp index 4e2b75812..afc0882ea 100644 --- a/src/MagnumPlugins/AnyImageImporter/Test/AnyImageImporterTest.cpp +++ b/src/MagnumPlugins/AnyImageImporter/Test/AnyImageImporterTest.cpp @@ -150,16 +150,13 @@ void AnyImageImporterTest::detect() { std::ostringstream out; Error redirectError{&out}; CORRADE_VERIFY(!importer->openFile(Utility::Directory::join(TEST_FILE_DIR, data.filename))); + /* Can't use raw string literals in macros on GCC 4.7 */ #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT CORRADE_COMPARE(out.str(), Utility::format( -R"(PluginManager::Manager::load(): plugin {0} is not static and was not found in nonexistent -Trade::AnyImageImporter::{1}(): cannot load {0} plugin -)", data.plugin, data.callback ? "openData" : "openFile")); +"PluginManager::Manager::load(): plugin {0} is not static and was not found in nonexistent\nTrade::AnyImageImporter::{1}(): cannot load {0} plugin\n", data.plugin, data.callback ? "openData" : "openFile")); #else CORRADE_COMPARE(out.str(), Utility::format( -R"(PluginManager::Manager::load(): plugin {0} was not found -Trade::AnyImageImporter::{1}(): cannot load {0} plugin -)", data.plugin, data.callback ? "openData" : "openFile")); +"PluginManager::Manager::load(): plugin {0} was not found\nTrade::AnyImageImporter::{1}(): cannot load {0} plugin\n", data.plugin, data.callback ? "openData" : "openFile")); #endif }