From 070d0358d868a40e05f658e420a0cd1cd259afe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 13 Nov 2013 20:53:59 +0100 Subject: [PATCH] GCC 4.5 compatibility: no nullptr here. --- src/Platform/ScreenedApplication.h | 4 ++++ src/Platform/ScreenedApplication.hpp | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Platform/ScreenedApplication.h b/src/Platform/ScreenedApplication.h index dc962bdf9..4cf05406c 100644 --- a/src/Platform/ScreenedApplication.h +++ b/src/Platform/ScreenedApplication.h @@ -97,7 +97,11 @@ template class BasicScreenedApplication: public Application, explicit BasicScreenedApplication(const typename Application::Arguments& arguments, const typename Application::Configuration& configuration = Application::Configuration()); /** @copydoc Sdl2Application::Sdl2Application(const Arguments&, std::nullptr_t) */ + #ifndef CORRADE_GCC45_COMPATIBILITY explicit BasicScreenedApplication(const typename Application::Arguments& arguments, std::nullptr_t); + #else + explicit BasicScreenedApplication(const typename Application::Arguments& arguments, void*); + #endif /** * @brief Add screen to application diff --git a/src/Platform/ScreenedApplication.hpp b/src/Platform/ScreenedApplication.hpp index 2063c51fb..f91111fd7 100644 --- a/src/Platform/ScreenedApplication.hpp +++ b/src/Platform/ScreenedApplication.hpp @@ -43,7 +43,12 @@ template void BasicScreen::mouseMoveEvent(MouseM template BasicScreenedApplication::BasicScreenedApplication(const typename Application::Arguments& arguments, const typename Application::Configuration& configuration): Application(arguments, configuration) {} -template BasicScreenedApplication::BasicScreenedApplication(const typename Application::Arguments& arguments, std::nullptr_t): Application(arguments, nullptr) {} +#ifndef CORRADE_GCC45_COMPATIBILITY +template BasicScreenedApplication::BasicScreenedApplication(const typename Application::Arguments& arguments, std::nullptr_t): +#else +template BasicScreenedApplication::BasicScreenedApplication(const typename Application::Arguments& arguments, void*): +#endif + Application(arguments, nullptr) {} template BasicScreenedApplication::~BasicScreenedApplication() = default;