Merge branch 'master' into compatibility

src/Platform/AbstractXApplication.h

@@ -83,11 +83,6 @@ class AbstractXApplication {
         void exit() { flags |= Flag::Exit; }
 
     protected:
-        /**
-         * @brief Destructor
-         *
-         * Deletes context and destroys the window.
-         */
         /* Nobody will need to have (and delete) AbstractXApplication*, thus
            this is faster than public pure virtual destructor */
         ~AbstractXApplication();

src/Platform/GlxApplication.cpp

@@ -38,6 +38,8 @@ GlxApplication::GlxApplication(const Arguments& arguments, void*)
 #endif
     : AbstractXApplication(new Implementation::GlxContextHandler, arguments, nullptr) {}
 
+GlxApplication::~GlxApplication() = default;
+
 template class BasicScreen<GlxApplication>;
 template class BasicScreenedApplication<GlxApplication>;
 

src/Platform/ScreenedApplication.h

@@ -94,10 +94,10 @@ template<class Application> class BasicScreenedApplication: public Application,
 
     public:
         /** @copydoc Sdl2Application::Sdl2Application(const Arguments, const Configuration&) */
-        BasicScreenedApplication(const typename Application::Arguments& arguments, const typename Application::Configuration& configuration = Application::Configuration()): Application(arguments, configuration) {}
+        explicit BasicScreenedApplication(const typename Application::Arguments& arguments, const typename Application::Configuration& configuration = Application::Configuration());
 
         /** @copydoc Sdl2Application::Sdl2Application(const Arguments&, std::nullptr_t) */
-        BasicScreenedApplication(const typename Application::Arguments& arguments, std::nullptr_t): Application(arguments, nullptr) {}
+        explicit BasicScreenedApplication(const typename Application::Arguments& arguments, std::nullptr_t);
 
         /**
          * @brief Add screen to application
@@ -157,6 +157,10 @@ template<class Application> class BasicScreenedApplication: public Application,
         }
 
     protected:
+        /* Nobody will need to have (and delete) ScreenedApplication*, thus
+           this is faster than public pure virtual destructor */
+        ~BasicScreenedApplication();
+
         /**
          * @brief Global viewport event
          *

src/Platform/ScreenedApplication.hpp

@@ -41,6 +41,12 @@ template<class Application> void BasicScreen<Application>::mousePressEvent(Mouse
 template<class Application> void BasicScreen<Application>::mouseReleaseEvent(MouseEvent&) {}
 template<class Application> void BasicScreen<Application>::mouseMoveEvent(MouseMoveEvent&) {}
 
+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) {}
+
+template<class Application> BasicScreenedApplication<Application>::~BasicScreenedApplication() = default;
+
 template<class Application> BasicScreenedApplication<Application>& BasicScreenedApplication<Application>::addScreen(BasicScreen<Application>& screen) {
     Containers::LinkedList<BasicScreen<Application>>::insert(&screen);
     if(frontScreen() == &screen) screen.focusEvent();

src/Platform/Sdl2Application.h

@@ -160,7 +160,7 @@ class Sdl2Application {
     protected:
         /* Nobody will need to have (and delete) Sdl2Application*, thus this is
            faster than public pure virtual destructor */
-        virtual ~Sdl2Application();
+        ~Sdl2Application();
 
         /** @copydoc GlutApplication::createContext() */
         void createContext(const Configuration& configuration);

src/Platform/XEglApplication.cpp

@@ -38,6 +38,8 @@ XEglApplication::XEglApplication(const Arguments& arguments, void*)
 #endif
     : AbstractXApplication(new Implementation::EglContextHandler, arguments, nullptr) {}
 
+XEglApplication::~XEglApplication() = default;
+
 template class BasicScreen<XEglApplication>;
 template class BasicScreenedApplication<XEglApplication>;
 

src/Text/Text.h

@@ -40,9 +40,7 @@ class AbstractLayouter;
 class DistanceFieldGlyphCache;
 class GlyphCache;
 
-#ifndef MAGNUM_GCC46_COMPATIBILITY
 enum class Alignment: UnsignedByte;
-#endif
 
 class AbstractRenderer;
 template<UnsignedInt> class Renderer;