Browse Source

GCC 4.5 compatibility: no nullptr here.

Vladimír Vondruš 13 years ago
parent
commit
070d0358d8
  1. 4
      src/Platform/ScreenedApplication.h
  2. 7
      src/Platform/ScreenedApplication.hpp

4
src/Platform/ScreenedApplication.h

@ -97,7 +97,11 @@ template<class Application> 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

7
src/Platform/ScreenedApplication.hpp

@ -43,7 +43,12 @@ template<class Application> void BasicScreen<Application>::mouseMoveEvent(MouseM
template<class Application> BasicScreenedApplication<Application>::BasicScreenedApplication(const typename Application::Arguments& arguments, const typename Application::Configuration& configuration): Application(arguments, configuration) {}
template<class Application> BasicScreenedApplication<Application>::BasicScreenedApplication(const typename Application::Arguments& arguments, std::nullptr_t): Application(arguments, nullptr) {}
#ifndef CORRADE_GCC45_COMPATIBILITY
template<class Application> BasicScreenedApplication<Application>::BasicScreenedApplication(const typename Application::Arguments& arguments, std::nullptr_t):
#else
template<class Application> BasicScreenedApplication<Application>::BasicScreenedApplication(const typename Application::Arguments& arguments, void*):
#endif
Application(arguments, nullptr) {}
template<class Application> BasicScreenedApplication<Application>::~BasicScreenedApplication() = default;

Loading…
Cancel
Save