diff --git a/src/Platform/AbstractXApplication.cpp b/src/Platform/AbstractXApplication.cpp index 8a7a1217a..a44881ba5 100644 --- a/src/Platform/AbstractXApplication.cpp +++ b/src/Platform/AbstractXApplication.cpp @@ -46,7 +46,12 @@ AbstractXApplication::AbstractXApplication(AbstractContextHandler* contextHandler, const Arguments&, std::nullptr_t): contextHandler(contextHandler), c(nullptr), flags(Flag::Redraw) {} +#ifndef CORRADE_GCC45_COMPATIBILITY +AbstractXApplication::AbstractXApplication(AbstractContextHandler* contextHandler, const Arguments&, std::nullptr_t) +#else +AbstractXApplication::AbstractXApplication(AbstractContextHandler* contextHandler, const Arguments&, void*) +#endif + : contextHandler(contextHandler), c(nullptr), flags(Flag::Redraw) {} void AbstractXApplication::createContext(const Configuration& configuration) { CORRADE_ASSERT(!c, "AbstractXApplication::createContext(): context already created", ); diff --git a/src/Platform/AbstractXApplication.h b/src/Platform/AbstractXApplication.h index bf9b46a29..ab3609b7d 100644 --- a/src/Platform/AbstractXApplication.h +++ b/src/Platform/AbstractXApplication.h @@ -94,7 +94,11 @@ class AbstractXApplication { * Unlike above, the context is not created and must be created later * with createContext() or tryCreateContext(). */ + #ifndef CORRADE_GCC45_COMPATIBILITY explicit AbstractXApplication(AbstractContextHandler* contextHandler, const Arguments& arguments, std::nullptr_t); + #else + explicit AbstractXApplication(AbstractContextHandler* contextHandler, const Arguments& arguments, void*); + #endif /** * @brief Execute main loop diff --git a/src/Platform/GlutApplication.cpp b/src/Platform/GlutApplication.cpp index fb92c6c3e..c4f3faa64 100644 --- a/src/Platform/GlutApplication.cpp +++ b/src/Platform/GlutApplication.cpp @@ -43,7 +43,13 @@ GlutApplication::GlutApplication(const Arguments& arguments): c(nullptr) { createContext({}); } -GlutApplication::GlutApplication(const Arguments& arguments, std::nullptr_t): c(nullptr) { +#ifndef CORRADE_GCC45_COMPATIBILITY +GlutApplication::GlutApplication(const Arguments& arguments, std::nullptr_t) +#else +GlutApplication::GlutApplication(const Arguments& arguments, void*) +#endif + : c(nullptr) +{ initialize(arguments.argc, arguments.argv); } diff --git a/src/Platform/GlutApplication.h b/src/Platform/GlutApplication.h index e037a849b..245eab58b 100644 --- a/src/Platform/GlutApplication.h +++ b/src/Platform/GlutApplication.h @@ -103,7 +103,11 @@ class GlutApplication { * Unlike above, the context is not created and must be created later * with createContext() or tryCreateContext(). */ + #ifndef CORRADE_GCC45_COMPATIBILITY explicit GlutApplication(const Arguments& arguments, std::nullptr_t); + #else + explicit GlutApplication(const Arguments& arguments, void*); + #endif /** * @brief Execute main loop diff --git a/src/Platform/GlxApplication.h b/src/Platform/GlxApplication.h index b3aeb562a..136cf75a0 100644 --- a/src/Platform/GlxApplication.h +++ b/src/Platform/GlxApplication.h @@ -60,7 +60,12 @@ class GlxApplication: public AbstractXApplication { explicit GlxApplication(const Arguments& arguments, const Configuration& configuration = Configuration()): AbstractXApplication(new GlxContextHandler, arguments, configuration) {} /** @copydoc GlutApplication::GlutApplication(const Arguments&, std::nullptr_t) */ - explicit GlxApplication(const Arguments& arguments, std::nullptr_t): AbstractXApplication(new GlxContextHandler, arguments, nullptr) {} + #ifndef CORRADE_GCC45_COMPATIBILITY + explicit GlxApplication(const Arguments& arguments, std::nullptr_t) + #else + explicit GlxApplication(const Arguments& arguments, void*) + #endif + : AbstractXApplication(new GlxContextHandler, arguments, nullptr) {} protected: /* Nobody will need to have (and delete) GlxApplication*, thus this is diff --git a/src/Platform/NaClApplication.cpp b/src/Platform/NaClApplication.cpp index b4a5ba4c2..2868b90d1 100644 --- a/src/Platform/NaClApplication.cpp +++ b/src/Platform/NaClApplication.cpp @@ -61,7 +61,13 @@ NaClApplication::NaClApplication(const Arguments& arguments): Instance(arguments createContext({}); } -NaClApplication::NaClApplication(const Arguments& arguments, std::nullptr_t): Instance(arguments), Graphics3DClient(this), MouseLock(this), c(nullptr) { +#ifndef CORRADE_GCC45_COMPATIBILITY +NaClApplication::NaClApplication(const Arguments& arguments, std::nullptr_t) +#else +NaClApplication::NaClApplication(const Arguments& arguments, void*) +#endif + : Instance(arguments), Graphics3DClient(this), MouseLock(this), c(nullptr) +{ debugOutput = new ConsoleDebugOutput(this); } diff --git a/src/Platform/NaClApplication.h b/src/Platform/NaClApplication.h index 367baad35..eddd28306 100644 --- a/src/Platform/NaClApplication.h +++ b/src/Platform/NaClApplication.h @@ -147,7 +147,11 @@ class NaClApplication: public pp::Instance, public pp::Graphics3DClient, public #endif /** @copydoc GlutApplication::GlutApplication(const Arguments&, std::nullptr_t) */ + #ifndef CORRADE_GCC45_COMPATIBILITY explicit NaClApplication(const Arguments& arguments, std::nullptr_t); + #else + explicit NaClApplication(const Arguments& arguments, void*); + #endif /** @brief Whether the application runs fullscreen */ bool isFullscreen(); diff --git a/src/Platform/Sdl2Application.cpp b/src/Platform/Sdl2Application.cpp index 734f6312c..9cde00102 100644 --- a/src/Platform/Sdl2Application.cpp +++ b/src/Platform/Sdl2Application.cpp @@ -59,7 +59,13 @@ Sdl2Application::Sdl2Application(const Arguments&): context(nullptr), flags(Flag createContext({}); } -Sdl2Application::Sdl2Application(const Arguments&, std::nullptr_t): context(nullptr), flags(Flag::Redraw) { +#ifndef CORRADE_GCC45_COMPATIBILITY +Sdl2Application::Sdl2Application(const Arguments&, std::nullptr_t) +#else +Sdl2Application::Sdl2Application(const Arguments&, void*) +#endif + : context(nullptr), flags(Flag::Redraw) +{ initialize(); } diff --git a/src/Platform/Sdl2Application.h b/src/Platform/Sdl2Application.h index 1fd62c431..9f6851cf9 100644 --- a/src/Platform/Sdl2Application.h +++ b/src/Platform/Sdl2Application.h @@ -90,7 +90,11 @@ class Sdl2Application { #endif /** @copydoc GlutApplication::GlutApplication(const Arguments&, std::nullptr_t) */ + #ifndef CORRADE_GCC45_COMPATIBILITY explicit Sdl2Application(const Arguments& arguments, std::nullptr_t); + #else + explicit Sdl2Application(const Arguments& arguments, void*); + #endif /** @copydoc GlutApplication::exec() */ int exec(); diff --git a/src/Platform/WindowlessGlxApplication.cpp b/src/Platform/WindowlessGlxApplication.cpp index 00fe92feb..a439e5496 100644 --- a/src/Platform/WindowlessGlxApplication.cpp +++ b/src/Platform/WindowlessGlxApplication.cpp @@ -43,7 +43,12 @@ WindowlessGlxApplication::WindowlessGlxApplication(const Arguments&): c(nullptr) createContext({}); } -WindowlessGlxApplication::WindowlessGlxApplication(const Arguments&, std::nullptr_t): c(nullptr) {} +#ifndef CORRADE_GCC45_COMPATIBILITY +WindowlessGlxApplication::WindowlessGlxApplication(const Arguments&, std::nullptr_t) +#else +WindowlessGlxApplication::WindowlessGlxApplication(const Arguments&, void*) +#endif + : c(nullptr) {} void WindowlessGlxApplication::createContext(const Configuration&) { CORRADE_ASSERT(!c, "WindowlessGlxApplication::createContext(): context already created", ); diff --git a/src/Platform/WindowlessGlxApplication.h b/src/Platform/WindowlessGlxApplication.h index ed9831b83..9d4924c64 100644 --- a/src/Platform/WindowlessGlxApplication.h +++ b/src/Platform/WindowlessGlxApplication.h @@ -83,7 +83,11 @@ class WindowlessGlxApplication { #endif /** @copydoc GlutApplication::GlutApplication(const Arguments&, std::nullptr_t) */ + #ifndef CORRADE_GCC45_COMPATIBILITY explicit WindowlessGlxApplication(const Arguments& arguments, std::nullptr_t); + #else + explicit WindowlessGlxApplication(const Arguments& arguments, void*); + #endif /** * @brief Execute application diff --git a/src/Platform/WindowlessNaClApplication.cpp b/src/Platform/WindowlessNaClApplication.cpp index 5336ba23c..34a2d4f5f 100644 --- a/src/Platform/WindowlessNaClApplication.cpp +++ b/src/Platform/WindowlessNaClApplication.cpp @@ -60,7 +60,13 @@ WindowlessNaClApplication::WindowlessNaClApplication(const Arguments& arguments) createContext({}); } -WindowlessNaClApplication::WindowlessNaClApplication(const Arguments& arguments, std::nullptr_t): Instance(arguments), Graphics3DClient(this), graphics(nullptr), c(nullptr) { +#ifndef CORRADE_GCC45_COMPATIBILITY +WindowlessNaClApplication::WindowlessNaClApplication(const Arguments& arguments, std::nullptr_t) +#else +WindowlessNaClApplication::WindowlessNaClApplication(const Arguments& arguments, void*) +#endif + : Instance(arguments), Graphics3DClient(this), graphics(nullptr), c(nullptr) +{ debugOutput = new ConsoleDebugOutput(this); } diff --git a/src/Platform/WindowlessNaClApplication.h b/src/Platform/WindowlessNaClApplication.h index 1fe6e6b81..9ff3a4b2a 100644 --- a/src/Platform/WindowlessNaClApplication.h +++ b/src/Platform/WindowlessNaClApplication.h @@ -100,7 +100,11 @@ class WindowlessNaClApplication: public pp::Instance, public pp::Graphics3DClien #endif /** @copydoc GlutApplication::GlutApplication(const Arguments&, std::nullptr_t) */ + #ifndef CORRADE_GCC45_COMPATIBILITY explicit WindowlessNaClApplication(const Arguments& arguments, std::nullptr_t); + #else + explicit WindowlessNaClApplication(const Arguments& arguments, void*); + #endif /** * @brief Execute application diff --git a/src/Platform/XEglApplication.h b/src/Platform/XEglApplication.h index 1b99b87f1..8eb94415f 100644 --- a/src/Platform/XEglApplication.h +++ b/src/Platform/XEglApplication.h @@ -60,7 +60,12 @@ class XEglApplication: public AbstractXApplication { explicit XEglApplication(const Arguments& arguments, const Configuration& configuration = Configuration()): AbstractXApplication(new EglContextHandler, arguments, configuration) {} /** @copydoc GlutApplication::GlutApplication(const Arguments&, std::nullptr_t) */ - explicit XEglApplication(const Arguments& arguments, std::nullptr_t): AbstractXApplication(new EglContextHandler, nullptr) {} + #ifndef CORRADE_GCC45_COMPATIBILITY + explicit XEglApplication(const Arguments& arguments, std::nullptr_t) + #else + explicit XEglApplication(const Arguments& arguments, void*) + #endif + : AbstractXApplication(new EglContextHandler, nullptr) {} protected: /* Nobody will need to have (and delete) XEglApplication*, thus this is