From 6459c9c8c038f588ea6d204a3d7e1c928e3dc2da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 7 Jul 2013 11:07:31 +0200 Subject: [PATCH] GCC 4.5 compatibility: can't default protected member in class body. --- src/SceneGraph/AbstractTransformation.h | 4 +++- src/SceneGraph/AbstractTranslationRotation2D.h | 3 ++- src/SceneGraph/AbstractTranslationRotation3D.h | 3 ++- src/SceneGraph/AbstractTranslationRotationScaling2D.h | 3 ++- src/SceneGraph/AbstractTranslationRotationScaling3D.h | 3 ++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/SceneGraph/AbstractTransformation.h b/src/SceneGraph/AbstractTransformation.h index f429a021e..db97d40e7 100644 --- a/src/SceneGraph/AbstractTransformation.h +++ b/src/SceneGraph/AbstractTransformation.h @@ -143,7 +143,7 @@ template class MAGNUM_SCENEGRAPH_EXPORT Abstrac } protected: - ~AbstractBasicTransformation() = default; + ~AbstractBasicTransformation(); #ifdef DOXYGEN_GENERATING_OUTPUT protected: @@ -154,6 +154,8 @@ template class MAGNUM_SCENEGRAPH_EXPORT Abstrac virtual void doResetTransformation() = 0; }; +template AbstractBasicTransformation::~AbstractBasicTransformation() = default; + /** @brief Transformation type */ enum class TransformationType: UnsignedByte { /** Global transformation, applied after all other transformations. */ diff --git a/src/SceneGraph/AbstractTranslationRotation2D.h b/src/SceneGraph/AbstractTranslationRotation2D.h index 80b1bea63..013cfcc73 100644 --- a/src/SceneGraph/AbstractTranslationRotation2D.h +++ b/src/SceneGraph/AbstractTranslationRotation2D.h @@ -74,7 +74,7 @@ template class AbstractBasicTranslationRotation2D: public AbstractBasic #endif protected: - ~AbstractBasicTranslationRotation2D() = default; + ~AbstractBasicTranslationRotation2D(); #ifdef DOXYGEN_GENERATING_OUTPUT protected: @@ -89,6 +89,7 @@ template class AbstractBasicTranslationRotation2D: public AbstractBasic }; template inline AbstractBasicTranslationRotation2D::AbstractBasicTranslationRotation2D() = default; +template inline AbstractBasicTranslationRotation2D::~AbstractBasicTranslationRotation2D() = default; /** @brief Base transformation for two-dimensional float scenes supporting translation and rotation diff --git a/src/SceneGraph/AbstractTranslationRotation3D.h b/src/SceneGraph/AbstractTranslationRotation3D.h index 94bb3badc..790b36ebe 100644 --- a/src/SceneGraph/AbstractTranslationRotation3D.h +++ b/src/SceneGraph/AbstractTranslationRotation3D.h @@ -121,7 +121,7 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic #endif protected: - ~AbstractBasicTranslationRotation3D() = default; + ~AbstractBasicTranslationRotation3D(); #ifdef DOXYGEN_GENERATING_OUTPUT protected: @@ -163,6 +163,7 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic }; template inline AbstractBasicTranslationRotation3D::AbstractBasicTranslationRotation3D() = default; +template inline AbstractBasicTranslationRotation3D::~AbstractBasicTranslationRotation3D() = default; /** @brief Base transformation for three-dimensional float scenes supporting translation and rotation diff --git a/src/SceneGraph/AbstractTranslationRotationScaling2D.h b/src/SceneGraph/AbstractTranslationRotationScaling2D.h index 112af0b2f..d136dfcb4 100644 --- a/src/SceneGraph/AbstractTranslationRotationScaling2D.h +++ b/src/SceneGraph/AbstractTranslationRotationScaling2D.h @@ -71,7 +71,7 @@ template class AbstractBasicTranslationRotationScaling2D: public Abstra #endif protected: - ~AbstractBasicTranslationRotationScaling2D() = default; + ~AbstractBasicTranslationRotationScaling2D(); #ifdef DOXYGEN_GENERATING_OUTPUT protected: @@ -83,6 +83,7 @@ template class AbstractBasicTranslationRotationScaling2D: public Abstra }; template inline AbstractBasicTranslationRotationScaling2D::AbstractBasicTranslationRotationScaling2D() = default; +template inline AbstractBasicTranslationRotationScaling2D::~AbstractBasicTranslationRotationScaling2D() = default; /** @brief Base transformation for two-dimensional float scenes supporting translation, rotation and scaling diff --git a/src/SceneGraph/AbstractTranslationRotationScaling3D.h b/src/SceneGraph/AbstractTranslationRotationScaling3D.h index 285c852b8..73ca2ab99 100644 --- a/src/SceneGraph/AbstractTranslationRotationScaling3D.h +++ b/src/SceneGraph/AbstractTranslationRotationScaling3D.h @@ -83,7 +83,7 @@ template class AbstractBasicTranslationRotationScaling3D: public Abstra #endif protected: - ~AbstractBasicTranslationRotationScaling3D() = default; + ~AbstractBasicTranslationRotationScaling3D(); #ifdef DOXYGEN_GENERATING_OUTPUT protected: @@ -95,6 +95,7 @@ template class AbstractBasicTranslationRotationScaling3D: public Abstra }; template inline AbstractBasicTranslationRotationScaling3D::AbstractBasicTranslationRotationScaling3D() = default; +template inline AbstractBasicTranslationRotationScaling3D::~AbstractBasicTranslationRotationScaling3D() = default; /** @brief Base transformation for three-dimensional float scenes supporting translation, rotation and scaling