Browse Source

SceneGraph: fix compile error in deprecated functions.

And that's only thanks to MSVC, which compiles even the code that is
nowhere used.
pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
c2040c53af
  1. 2
      src/Magnum/SceneGraph/AbstractTranslationRotation2D.h
  2. 4
      src/Magnum/SceneGraph/AbstractTranslationRotation3D.h

2
src/Magnum/SceneGraph/AbstractTranslationRotation2D.h

@ -77,7 +77,7 @@ template<class T> class AbstractBasicTranslationRotation2D: public AbstractBasic
* instead.
*/
CORRADE_DEPRECATED("use rotate() or rotateLocal() instead") AbstractBasicTranslationRotation2D<T>& rotate(Math::Rad<T> angle, TransformationType type) {
return type == TransformationType::Global ? rotate(angle, type) : rotateLocal(angle, type);
return type == TransformationType::Global ? rotate(angle) : rotateLocal(angle);
}
#endif

4
src/Magnum/SceneGraph/AbstractTranslationRotation3D.h

@ -201,7 +201,7 @@ template<class T> class AbstractBasicTranslationRotation3D: public AbstractBasic
* instead.
*/
CORRADE_DEPRECATED("use rotateZ() or rotateZLocal() instead") AbstractBasicTranslationRotation3D<T>& rotateZ(Math::Rad<T> 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 T> class AbstractBasicTranslationRotation3D: public AbstractBasic
return *this;
}
#ifdef MAGNUM_BUILD_DEPRECATED
CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractBasicTranslationRotation3D<T>& translate(const Math::Vector2<T>& vector, TransformationType type) {
CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractBasicTranslationRotation3D<T>& translate(const Math::Vector3<T>& vector, TransformationType type) {
AbstractBasicTranslation3D<T>::translate(vector, type);
return *this;
}

Loading…
Cancel
Save