From 26b51ad614aa3687be3422f87d827d8860e3c3cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 17 Jan 2016 22:03:53 +0100
Subject: [PATCH] Adapted to Corrade changes.

---
 src/Magnum/AbstractShaderProgram.cpp   | 4 ++--
 src/Magnum/Shader.cpp                  | 4 ++--
 src/Magnum/Test/AbstractOpenGLTester.h | 8 +++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Magnum/AbstractShaderProgram.cpp b/src/Magnum/AbstractShaderProgram.cpp
index b1b41ce8f..17b85f5b8 100644
--- a/src/Magnum/AbstractShaderProgram.cpp
+++ b/src/Magnum/AbstractShaderProgram.cpp
@@ -406,7 +406,7 @@ bool AbstractShaderProgram::link(std::initializer_list<std::reference_wrapper<Ab
 
         /* Show error log */
         if(!success) {
-            auto out = Error::noNewlineAtTheEnd();
+            Error out{Debug::Flag::NoNewlineAtTheEnd};
             out << "AbstractShaderProgram::link(): linking";
             if(shaders.size() != 1) {
                 #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
@@ -419,7 +419,7 @@ bool AbstractShaderProgram::link(std::initializer_list<std::reference_wrapper<Ab
 
         /* Or just warnings, if any */
         } else if(!message.empty() && !Implementation::isProgramLinkLogEmpty(message)) {
-            auto out = Warning::noNewlineAtTheEnd();
+            Warning out{Debug::Flag::NoNewlineAtTheEnd};
             out << "AbstractShaderProgram::link(): linking";
             if(shaders.size() != 1) {
                 #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
diff --git a/src/Magnum/Shader.cpp b/src/Magnum/Shader.cpp
index 036a6d340..1d5a3f45b 100644
--- a/src/Magnum/Shader.cpp
+++ b/src/Magnum/Shader.cpp
@@ -856,7 +856,7 @@ bool Shader::compile(std::initializer_list<std::reference_wrapper<Shader>> shade
 
         /* Show error log */
         if(!success) {
-            auto out = Error::noNewlineAtTheEnd();
+            Error out{Debug::Flag::NoNewlineAtTheEnd};
             out << "Shader::compile(): compilation of" << shaderName(shader._type) << "shader";
             if(shaders.size() != 1) {
                 #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
@@ -869,7 +869,7 @@ bool Shader::compile(std::initializer_list<std::reference_wrapper<Shader>> shade
 
         /* Or just warnings, if any */
         } else if(!message.empty() && !Implementation::isShaderCompilationLogEmpty(message)) {
-            auto out = Warning::noNewlineAtTheEnd();
+            Warning out{Debug::Flag::NoNewlineAtTheEnd};
             out << "Shader::compile(): compilation of" << shaderName(shader._type) << "shader";
             if(shaders.size() != 1) {
                 #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
diff --git a/src/Magnum/Test/AbstractOpenGLTester.h b/src/Magnum/Test/AbstractOpenGLTester.h
index 94be55706..22b8161a6 100644
--- a/src/Magnum/Test/AbstractOpenGLTester.h
+++ b/src/Magnum/Test/AbstractOpenGLTester.h
@@ -66,7 +66,7 @@ class AbstractOpenGLTester: public TestSuite::Tester {
         } _windowlessApplication;
 };
 
-AbstractOpenGLTester::AbstractOpenGLTester(): _windowlessApplication{*_windowlessApplicationArguments} {
+AbstractOpenGLTester::AbstractOpenGLTester(): TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, _windowlessApplication{*_windowlessApplicationArguments} {
     /* Try to create debug context, fallback to normal one if not possible. No
        such thing on OSX. */
     #ifndef CORRADE_TARGET_APPLE
@@ -96,7 +96,7 @@ std::optional<Platform::WindowlessApplication::Arguments> AbstractOpenGLTester::
         Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments.emplace(argc, argv); \
         Class t;                                                            \
         t.registerTest(__FILE__, #Class);                                   \
-        return t.exec();                                                    \
+        return t.exec(argc, argv);                                          \
     }
 #else
 #define MAGNUM_GL_TEST_MAIN(Class)                                          \
@@ -109,7 +109,9 @@ std::optional<Platform::WindowlessApplication::Arguments> AbstractOpenGLTester::
                     Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments->window = hWnd; \
                     Class t;                                                \
                     t.registerTest(__FILE__, #Class);                       \
-                    PostQuitMessage(ret = t.exec());                        \
+                    PostQuitMessage(ret = t.exec(                           \
+                        Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments->argc, \
+                        Magnum::Test::AbstractOpenGLTester::_windowlessApplicationArguments->argv)); \
                 }                                                           \
                 break;                                                      \
             default: return DefWindowProc(hWnd, message, wParam, lParam);   \