From bacad74ae16df0e4207e383af284f2bfd7c30c20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 30 Oct 2013 13:52:12 +0100 Subject: [PATCH] GCC 4.5 compatibility: nullptr-related issues. --- src/Platform/GlxApplication.cpp | 7 ++++++- src/Platform/XEglApplication.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Platform/GlxApplication.cpp b/src/Platform/GlxApplication.cpp index 848ba0af0..ad864107c 100644 --- a/src/Platform/GlxApplication.cpp +++ b/src/Platform/GlxApplication.cpp @@ -30,6 +30,11 @@ namespace Magnum { namespace Platform { GlxApplication::GlxApplication(const Arguments& arguments, const Configuration& configuration): AbstractXApplication(new Implementation::GlxContextHandler, arguments, configuration) {} -GlxApplication::GlxApplication(const Arguments& arguments, std::nullptr_t): AbstractXApplication(new Implementation::GlxContextHandler, arguments, nullptr) {} +#ifndef CORRADE_GCC45_COMPATIBILITY +GlxApplication::GlxApplication(const Arguments& arguments, std::nullptr_t) +#else +GlxApplication::GlxApplication(const Arguments& arguments, void*) +#endif + : AbstractXApplication(new Implementation::GlxContextHandler, arguments, nullptr) {} }} diff --git a/src/Platform/XEglApplication.cpp b/src/Platform/XEglApplication.cpp index 4449db1b6..94bc7ad02 100644 --- a/src/Platform/XEglApplication.cpp +++ b/src/Platform/XEglApplication.cpp @@ -30,6 +30,11 @@ namespace Magnum { namespace Platform { XEglApplication::XEglApplication(const Arguments& arguments, const Configuration& configuration): AbstractXApplication(new Implementation::EglContextHandler, arguments, configuration) {} -XEglApplication::XEglApplication(const Arguments& arguments, std::nullptr_t): AbstractXApplication(new Implementation::EglContextHandler, arguments, nullptr) {} +#ifndef CORRADE_GCC45_COMPATIBILITY +XEglApplication::XEglApplication(const Arguments& arguments, std::nullptr_t) +#else +XEglApplication::XEglApplication(const Arguments& arguments, void*) +#endif + : AbstractXApplication(new Implementation::EglContextHandler, arguments, nullptr) {} }}