From c2040c53af759fd73af72ca10b7fd1b2d6134118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 29 Apr 2015 20:16:08 +0200 Subject: [PATCH] SceneGraph: fix compile error in deprecated functions. And that's only thanks to MSVC, which compiles even the code that is nowhere used. --- src/Magnum/SceneGraph/AbstractTranslationRotation2D.h | 2 +- src/Magnum/SceneGraph/AbstractTranslationRotation3D.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h b/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h index e188a45b1..bce459ae1 100644 --- a/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h +++ b/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h @@ -77,7 +77,7 @@ template class AbstractBasicTranslationRotation2D: public AbstractBasic * instead. */ CORRADE_DEPRECATED("use rotate() or rotateLocal() instead") AbstractBasicTranslationRotation2D& rotate(Math::Rad angle, TransformationType type) { - return type == TransformationType::Global ? rotate(angle, type) : rotateLocal(angle, type); + return type == TransformationType::Global ? rotate(angle) : rotateLocal(angle); } #endif diff --git a/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h b/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h index ba7464c2f..c0f9e19e2 100644 --- a/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h +++ b/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h @@ -201,7 +201,7 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic * instead. */ CORRADE_DEPRECATED("use rotateZ() or rotateZLocal() instead") AbstractBasicTranslationRotation3D& rotateZ(Math::Rad angle, TransformationType type) { - return type == TransformationType::Global ? rotateZ(angle) : rotateZLocal(); + return type == TransformationType::Global ? rotateZ(angle) : rotateZLocal(angle); } #endif @@ -220,7 +220,7 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic return *this; } #ifdef MAGNUM_BUILD_DEPRECATED - CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractBasicTranslationRotation3D& translate(const Math::Vector2& vector, TransformationType type) { + CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractBasicTranslationRotation3D& translate(const Math::Vector3& vector, TransformationType type) { AbstractBasicTranslation3D::translate(vector, type); return *this; }