Browse Source

Use CORRADE_DEPRECATED_ALIAS() for deprecating using declarations.

pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
367be9f7f3
  1. 2
      src/Magnum/ImageReference.h
  2. 2
      src/Magnum/Magnum.h
  3. 6
      src/Magnum/SceneGraph/AbstractCamera.h
  4. 6
      src/Magnum/SceneGraph/SceneGraph.h

2
src/Magnum/ImageReference.h

@ -40,7 +40,7 @@ namespace Magnum {
/** @copybrief ImageView
* @deprecated Use @ref ImageView instead.
*/
template<UnsignedInt dimensions> using CORRADE_DEPRECATED("use ImageView instead") ImageReference = ImageView<dimensions>;
template<UnsignedInt dimensions> using CORRADE_DEPRECATED_ALIAS("use ImageView instead") ImageReference = ImageView<dimensions>;
/** @copybrief ImageView1D
* @deprecated Use @ref ImageView1D instead.

2
src/Magnum/Magnum.h

@ -496,7 +496,7 @@ typedef ImageView<2> ImageView2D;
typedef ImageView<3> ImageView3D;
#ifdef MAGNUM_BUILD_DEPRECATED
template<UnsignedInt dimensions> using ImageReference CORRADE_DEPRECATED("use ImageView instead") = ImageView<dimensions>;
template<UnsignedInt dimensions> using ImageReference CORRADE_DEPRECATED_ALIAS("use ImageView instead") = ImageView<dimensions>;
typedef CORRADE_DEPRECATED("use ImageView1D instead") ImageView1D ImageReference1D;
typedef CORRADE_DEPRECATED("use ImageView2D instead") ImageView2D ImageReference2D;
typedef CORRADE_DEPRECATED("use ImageView3D instead") ImageView3D ImageReference3D;

6
src/Magnum/SceneGraph/AbstractCamera.h

@ -41,13 +41,13 @@ namespace Magnum { namespace SceneGraph {
* @copybrief Camera
* @deprecated Use @ref Camera instead.
*/
template<UnsignedInt dimensions, class T> using AbstractCamera CORRADE_DEPRECATED("use Camera instead") = Camera<dimensions, T>;
template<UnsignedInt dimensions, class T> using AbstractCamera CORRADE_DEPRECATED_ALIAS("use Camera instead") = Camera<dimensions, T>;
/**
* @copybrief BasicCamera2D
* @deprecated Use @ref BasicCamera2D instead.
*/
template<class T> using AbstractBasicCamera2D CORRADE_DEPRECATED("use BasicCamera2D instead") = BasicCamera2D<T>;
template<class T> using AbstractBasicCamera2D CORRADE_DEPRECATED_ALIAS("use BasicCamera2D instead") = BasicCamera2D<T>;
/**
* @copybrief Camera2D
@ -59,7 +59,7 @@ CORRADE_DEPRECATED("use Camera2D instead") typedef Camera2D AbstractCamera2D;
* @copybrief BasicCamera3D
* @deprecated Use @ref BasicCamera3D instead.
*/
template<class T> using AbstractBasicCamera3D CORRADE_DEPRECATED("use BasicCamera3D instead") = BasicCamera3D<T>;
template<class T> using AbstractBasicCamera3D CORRADE_DEPRECATED_ALIAS("use BasicCamera3D instead") = BasicCamera3D<T>;
/**
* @copybrief Camera3D

6
src/Magnum/SceneGraph/SceneGraph.h

@ -105,10 +105,10 @@ typedef BasicCamera2D<Float> Camera2D;
typedef BasicCamera3D<Float> Camera3D;
#ifdef MAGNUM_BUILD_DEPRECATED
template<UnsignedInt dimensions, class T> using AbstractCamera CORRADE_DEPRECATED("use BasicCamera2D instead") = Camera<dimensions, T>;
template<class T> using AbstractBasicCamera2D CORRADE_DEPRECATED("use BasicCamera2D instead") = BasicCamera2D<T>;
template<UnsignedInt dimensions, class T> using AbstractCamera CORRADE_DEPRECATED_ALIAS("use BasicCamera2D instead") = Camera<dimensions, T>;
template<class T> using AbstractBasicCamera2D CORRADE_DEPRECATED_ALIAS("use BasicCamera2D instead") = BasicCamera2D<T>;
CORRADE_DEPRECATED("use Camera2D instead") typedef Camera2D AbstractCamera2D;
template<class T> using AbstractBasicCamera3D CORRADE_DEPRECATED("use BasicCamera3D instead") = BasicCamera3D<T>;
template<class T> using AbstractBasicCamera3D CORRADE_DEPRECATED_ALIAS("use BasicCamera3D instead") = BasicCamera3D<T>;
CORRADE_DEPRECATED("use Camera3D instead") typedef Camera3D AbstractCamera3D;
#endif

Loading…
Cancel
Save