From 5d38175a068ed7ea5394ef7f1b19f6d4dae81a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 17 Jan 2016 00:19:46 +0100 Subject: [PATCH] Adapted to Corrade changes. --- src/MagnumPlugins/AnyAudioImporter/Test/Test.cpp | 2 +- src/MagnumPlugins/AnyImageConverter/Test/Test.cpp | 2 +- src/MagnumPlugins/AnyImageImporter/Test/Test.cpp | 2 +- src/MagnumPlugins/AnySceneImporter/Test/Test.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/MagnumPlugins/AnyAudioImporter/Test/Test.cpp b/src/MagnumPlugins/AnyAudioImporter/Test/Test.cpp index 6b42b4580..165521feb 100644 --- a/src/MagnumPlugins/AnyAudioImporter/Test/Test.cpp +++ b/src/MagnumPlugins/AnyAudioImporter/Test/Test.cpp @@ -80,7 +80,7 @@ void AnyImporterTest::ogg() { void AnyImporterTest::unknown() { std::ostringstream output; - Error::setOutput(&output); + Error redirectError{&output}; AnyImporter importer{_manager}; CORRADE_VERIFY(!importer.openFile("sound.mid")); diff --git a/src/MagnumPlugins/AnyImageConverter/Test/Test.cpp b/src/MagnumPlugins/AnyImageConverter/Test/Test.cpp index de288cddd..51d2fa982 100644 --- a/src/MagnumPlugins/AnyImageConverter/Test/Test.cpp +++ b/src/MagnumPlugins/AnyImageConverter/Test/Test.cpp @@ -79,7 +79,7 @@ void AnyImageConverterTest::png() { void AnyImageConverterTest::unknown() { std::ostringstream output; - Error::setOutput(&output); + Error redirectError{&output}; AnyImageConverter converter{_manager}; CORRADE_VERIFY(!converter.exportToFile(Image, "image.xcf")); diff --git a/src/MagnumPlugins/AnyImageImporter/Test/Test.cpp b/src/MagnumPlugins/AnyImageImporter/Test/Test.cpp index e77f4a266..67063e7c8 100644 --- a/src/MagnumPlugins/AnyImageImporter/Test/Test.cpp +++ b/src/MagnumPlugins/AnyImageImporter/Test/Test.cpp @@ -97,7 +97,7 @@ void AnyImageImporterTest::png() { void AnyImageImporterTest::unknown() { std::ostringstream output; - Error::setOutput(&output); + Error redirectError{&output}; AnyImageImporter importer{_manager}; CORRADE_VERIFY(!importer.openFile("image.xcf")); diff --git a/src/MagnumPlugins/AnySceneImporter/Test/Test.cpp b/src/MagnumPlugins/AnySceneImporter/Test/Test.cpp index 226c593be..e262d75c6 100644 --- a/src/MagnumPlugins/AnySceneImporter/Test/Test.cpp +++ b/src/MagnumPlugins/AnySceneImporter/Test/Test.cpp @@ -82,7 +82,7 @@ void AnySceneImporterTest::ply() { void AnySceneImporterTest::unknown() { std::ostringstream output; - Error::setOutput(&output); + Error redirectError{&output}; AnySceneImporter importer{_manager}; CORRADE_VERIFY(!importer.openFile("mesh.stl"));