From dc03e7b6d7ff6c91a89b1e978e7cde68c6e291e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 30 Oct 2013 13:52:53 +0100 Subject: [PATCH] GCC 4.5 compatibility: can't default some functions in class body. --- src/Platform/GlxApplication.h | 4 +++- src/Platform/XEglApplication.h | 4 +++- src/SceneGraph/AbstractTranslation.h | 8 ++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Platform/GlxApplication.h b/src/Platform/GlxApplication.h index 3280fec13..a9687e5e7 100644 --- a/src/Platform/GlxApplication.h +++ b/src/Platform/GlxApplication.h @@ -78,9 +78,11 @@ class GlxApplication: public AbstractXApplication { protected: /* Nobody will need to have (and delete) GlxApplication*, thus this is faster than public pure virtual destructor */ - ~GlxApplication() = default; + ~GlxApplication(); }; +GlxApplication::~GlxApplication() = default; + /** @hideinitializer @brief Entry point for GLX-based applications @param className Class name diff --git a/src/Platform/XEglApplication.h b/src/Platform/XEglApplication.h index d8981f9e9..33b946388 100644 --- a/src/Platform/XEglApplication.h +++ b/src/Platform/XEglApplication.h @@ -79,9 +79,11 @@ class XEglApplication: public AbstractXApplication { protected: /* Nobody will need to have (and delete) XEglApplication*, thus this is faster than public pure virtual destructor */ - ~XEglApplication() = default; + ~XEglApplication(); }; +XEglApplication::~XEglApplication() = default; + /** @hideinitializer @brief Entry point for X/EGL-based applications @param className Class name diff --git a/src/SceneGraph/AbstractTranslation.h b/src/SceneGraph/AbstractTranslation.h index df64b3d58..a2ecf6e47 100644 --- a/src/SceneGraph/AbstractTranslation.h +++ b/src/SceneGraph/AbstractTranslation.h @@ -51,7 +51,7 @@ template #endif class AbstractTranslation: public AbstractTransformation { public: - explicit AbstractTranslation() = default; + explicit AbstractTranslation(); /** * @brief Translate object @@ -68,7 +68,7 @@ class AbstractTranslation: public AbstractTransformation { } protected: - ~AbstractTranslation() = default; + ~AbstractTranslation(); #ifdef DOXYGEN_GENERATING_OUTPUT protected: @@ -79,6 +79,10 @@ class AbstractTranslation: public AbstractTransformation { virtual void doTranslate(const typename DimensionTraits::VectorType& vector, TransformationType type) = 0; }; +template AbstractTranslation::AbstractTranslation() = default; + +template AbstractTranslation::~AbstractTranslation() = default; + #ifndef CORRADE_GCC46_COMPATIBILITY /** @brief Base transformation for two-dimensional scenes supporting translation