ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Adapt to moving CORRADE_DEPRECATED*() macros to a dedicated header.

pull/686/head
Vladimír Vondruš 4 months ago
parent
998919110c
commit
2ea43a8c5e
36 changed files with 38 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/Magnum/Array.h
  2. 2
      src/Magnum/DebugTools/BufferData.h
  3. 2
      src/Magnum/DebugTools/DebugTools.h
  4. 2
      src/Magnum/DebugTools/Profiler.h
  5. 2
      src/Magnum/GL/AbstractShaderProgram.h
  6. 2
      src/Magnum/GL/Attribute.h
  7. 2
      src/Magnum/GL/PixelFormat.h
  8. 2
      src/Magnum/GL/Renderer.h
  9. 2
      src/Magnum/GL/Shader.h
  10. 2
      src/Magnum/Magnum.h
  11. 2
      src/Magnum/MaterialTools/PhongToPbrMetallicRoughness.h
  12. 2
      src/Magnum/Math/BoolVector.h
  13. 2
      src/Magnum/Math/Math.h
  14. 2
      src/Magnum/Math/Tags.h
  15. 2
      src/Magnum/Math/TypeTraits.h
  16. 2
      src/Magnum/MeshTools/CombineIndexedArrays.h
  17. 2
      src/Magnum/MeshTools/Compile.h
  18. 2
      src/Magnum/MeshTools/CompressIndices.h
  19. 2
      src/Magnum/MeshTools/FilterAttributes.h
  20. 4
      src/Magnum/MeshTools/FlipNormals.h
  21. 2
      src/Magnum/MeshTools/Reference.h
  22. 2
      src/Magnum/MeshTools/Tipsify.h
  23. 2
      src/Magnum/PixelFormat.h
  24. 2
      src/Magnum/Platform/EmscriptenApplication.h
  25. 2
      src/Magnum/SceneTools/FlattenMeshHierarchy.h
  26. 2
      src/Magnum/SceneTools/FlattenTransformationHierarchy.h
  27. 2
      src/Magnum/SceneTools/OrderClusterParents.h
  28. 2
      src/Magnum/Shaders/Shaders.h
  29. 2
      src/Magnum/Text/AbstractGlyphCache.h
  30. 2
      src/Magnum/Text/GlyphCache.h
  31. 2
      src/Magnum/Text/Text.h
  32. 2
      src/Magnum/TextureTools/Atlas.h
  33. 2
      src/Magnum/TextureTools/DistanceField.h
  34. 2
      src/Magnum/Trade/MaterialData.h
  35. 2
      src/Magnum/Trade/Trade.h
  36. 4
      src/Magnum/Vk/Enums.h

2
src/Magnum/Array.h
Unescape View File

@ -39,7 +39,7 @@
#include <type_traits> #include <type_traits>
#include <Corrade/Containers/sequenceHelpers.h> #include <Corrade/Containers/sequenceHelpers.h>
#include <Corrade/Utility/Debug.h> #include <Corrade/Utility/Debug.h>
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#include "Magnum/Magnum.h" #include "Magnum/Magnum.h"
#include "Magnum/Math/Vector3.h" #include "Magnum/Math/Vector3.h"

2
src/Magnum/DebugTools/BufferData.h
Unescape View File

@ -54,7 +54,7 @@
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Containers/Array.h> #include <Corrade/Containers/Array.h>
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#include "Magnum/GL/Buffer.h" #include "Magnum/GL/Buffer.h"
#endif #endif

2
src/Magnum/DebugTools/DebugTools.h
Unescape View File

@ -33,7 +33,7 @@
#include "Magnum/Types.h" #include "Magnum/Types.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT

2
src/Magnum/DebugTools/Profiler.h
Unescape View File

@ -42,7 +42,7 @@
#include <initializer_list> #include <initializer_list>
#include <string> #include <string>
#include <vector> #include <vector>
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#include "Magnum/Types.h" #include "Magnum/Types.h"
#include "Magnum/DebugTools/visibility.h" #include "Magnum/DebugTools/visibility.h"

2
src/Magnum/GL/AbstractShaderProgram.h
Unescape View File

@ -41,7 +41,7 @@
#endif #endif
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
/* For attachShaders(), which used to take a std::initializer_list<Reference>, /* For attachShaders(), which used to take a std::initializer_list<Reference>,
and draw({MeshView}) as well */ and draw({MeshView}) as well */
#include <Corrade/Containers/Iterable.h> #include <Corrade/Containers/Iterable.h>

2
src/Magnum/GL/Attribute.h
Unescape View File

@ -38,7 +38,7 @@
#include "Magnum/Math/TypeTraits.h" #include "Magnum/Math/TypeTraits.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
namespace Magnum { namespace GL { namespace Magnum { namespace GL {

2
src/Magnum/GL/PixelFormat.h
Unescape View File

@ -37,7 +37,7 @@
#include "Magnum/GL/visibility.h" #include "Magnum/GL/visibility.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
namespace Magnum { namespace GL { namespace Magnum { namespace GL {

2
src/Magnum/GL/Renderer.h
Unescape View File

@ -38,7 +38,7 @@
#include "Magnum/GL/visibility.h" #include "Magnum/GL/visibility.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
namespace Magnum { namespace GL { namespace Magnum { namespace GL {

2
src/Magnum/GL/Shader.h
Unescape View File

@ -38,7 +38,7 @@
#include "Magnum/GL/GL.h" #include "Magnum/GL/GL.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
/* For label() / setLabel() and all name/source stuff, which used to be a /* For label() / setLabel() and all name/source stuff, which used to be a
std::string. Not ideal for the return types, but at least something. */ std::string. Not ideal for the return types, but at least something. */
#include <Corrade/Containers/StringStl.h> #include <Corrade/Containers/StringStl.h>

2
src/Magnum/Magnum.h
Unescape View File

@ -36,7 +36,7 @@
#include "Magnum/Math/Math.h" #include "Magnum/Math/Math.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
namespace Magnum { namespace Magnum {

2
src/Magnum/MaterialTools/PhongToPbrMetallicRoughness.h
Unescape View File

@ -38,7 +38,7 @@
#include "Magnum/Trade/Trade.h" #include "Magnum/Trade/Trade.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
namespace Magnum { namespace MaterialTools { namespace Magnum { namespace MaterialTools {

2
src/Magnum/Math/BoolVector.h
Unescape View File

@ -37,7 +37,7 @@
#include "Magnum/configure.h" #include "Magnum/configure.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#include "Magnum/Math/BitVector.h" #include "Magnum/Math/BitVector.h"

2
src/Magnum/Math/Math.h
Unescape View File

@ -35,7 +35,7 @@
#include "Magnum/Types.h" #include "Magnum/Types.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT

2
src/Magnum/Math/Tags.h
Unescape View File

@ -33,7 +33,7 @@
#include "Magnum/Tags.h" #include "Magnum/Tags.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
namespace Magnum { namespace Math { namespace Magnum { namespace Math {

2
src/Magnum/Math/TypeTraits.h
Unescape View File

@ -37,7 +37,7 @@
#include "Magnum/Types.h" #include "Magnum/Types.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED

2
src/Magnum/MeshTools/CombineIndexedArrays.h
Unescape View File

@ -41,7 +41,7 @@
#include <tuple> #include <tuple>
#include <vector> #include <vector>
#include <Corrade/Utility/Assert.h> #include <Corrade/Utility/Assert.h>
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#include "Magnum/Types.h" #include "Magnum/Types.h"
#include "Magnum/MeshTools/visibility.h" #include "Magnum/MeshTools/visibility.h"

2
src/Magnum/MeshTools/Compile.h
Unescape View File

@ -43,7 +43,7 @@
#include "Magnum/MeshTools/visibility.h" #include "Magnum/MeshTools/visibility.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
namespace Magnum { namespace MeshTools { namespace Magnum { namespace MeshTools {

2
src/Magnum/MeshTools/CompressIndices.h
Unescape View File

@ -37,7 +37,7 @@
#include "Magnum/Trade/Trade.h" #include "Magnum/Trade/Trade.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#include <Corrade/Utility/StlForwardVector.h> #include <Corrade/Utility/StlForwardVector.h>
#include <Corrade/Utility/StlForwardTuple.h> #include <Corrade/Utility/StlForwardTuple.h>

2
src/Magnum/MeshTools/FilterAttributes.h
Unescape View File

@ -36,7 +36,7 @@
#include "Magnum/configure.h" #include "Magnum/configure.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#include "Magnum/MeshTools/Filter.h" #include "Magnum/MeshTools/Filter.h"

4
src/Magnum/MeshTools/FlipNormals.h
Unescape View File

@ -36,10 +36,10 @@
#include "Magnum/MeshTools/visibility.h" #include "Magnum/MeshTools/visibility.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/StlForwardVector.h>
#include <Corrade/Containers/ArrayViewStl.h> #include <Corrade/Containers/ArrayViewStl.h>
#include <Corrade/Containers/StridedArrayView.h> #include <Corrade/Containers/StridedArrayView.h>
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#include <Corrade/Utility/StlForwardVector.h>
#endif #endif
namespace Magnum { namespace MeshTools { namespace Magnum { namespace MeshTools {

2
src/Magnum/MeshTools/Reference.h
Unescape View File

@ -36,7 +36,7 @@
#include "Magnum/configure.h" #include "Magnum/configure.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#include "Magnum/MeshTools/Copy.h" #include "Magnum/MeshTools/Copy.h"

2
src/Magnum/MeshTools/Tipsify.h
Unescape View File

@ -39,7 +39,7 @@
#include <vector> #include <vector>
#include <Corrade/Containers/ArrayViewStl.h> #include <Corrade/Containers/ArrayViewStl.h>
#include <Corrade/Containers/StridedArrayView.h> #include <Corrade/Containers/StridedArrayView.h>
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
namespace Magnum { namespace MeshTools { namespace Magnum { namespace MeshTools {

2
src/Magnum/PixelFormat.h
Unescape View File

@ -36,7 +36,7 @@
#include "Magnum/visibility.h" #include "Magnum/visibility.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
namespace Magnum { namespace Magnum {

2
src/Magnum/Platform/EmscriptenApplication.h
Unescape View File

@ -52,9 +52,9 @@
#endif #endif
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h>
/* Some APIs used to take or return a std::string before */ /* Some APIs used to take or return a std::string before */
#include <Corrade/Containers/StringStl.h> #include <Corrade/Containers/StringStl.h>
#include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
#if defined(CORRADE_TARGET_EMSCRIPTEN) || defined(DOXYGEN_GENERATING_OUTPUT) #if defined(CORRADE_TARGET_EMSCRIPTEN) || defined(DOXYGEN_GENERATING_OUTPUT)

2
src/Magnum/SceneTools/FlattenMeshHierarchy.h
Unescape View File

@ -39,7 +39,7 @@
#include "Magnum/configure.h" #include "Magnum/configure.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#include "Magnum/Magnum.h" #include "Magnum/Magnum.h"
#include "Magnum/Math/Matrix3.h" #include "Magnum/Math/Matrix3.h"

2
src/Magnum/SceneTools/FlattenTransformationHierarchy.h
Unescape View File

@ -40,7 +40,7 @@
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Containers/Array.h> #include <Corrade/Containers/Array.h>
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#include "Magnum/Math/Matrix3.h" #include "Magnum/Math/Matrix3.h"
#include "Magnum/Math/Matrix4.h" #include "Magnum/Math/Matrix4.h"

2
src/Magnum/SceneTools/OrderClusterParents.h
Unescape View File

@ -39,7 +39,7 @@
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Containers/Array.h> #include <Corrade/Containers/Array.h>
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#include "Magnum/SceneTools/Hierarchy.h" #include "Magnum/SceneTools/Hierarchy.h"

2
src/Magnum/Shaders/Shaders.h
Unescape View File

@ -33,7 +33,7 @@
#include "Magnum/Types.h" #include "Magnum/Types.h"
#if defined(MAGNUM_TARGET_GL) && defined(MAGNUM_BUILD_DEPRECATED) #if defined(MAGNUM_TARGET_GL) && defined(MAGNUM_BUILD_DEPRECATED)
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT

2
src/Magnum/Text/AbstractGlyphCache.h
Unescape View File

@ -42,7 +42,7 @@
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <utility> /* std::pair */ #include <utility> /* std::pair */
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#include <Corrade/Utility/StlForwardVector.h> #include <Corrade/Utility/StlForwardVector.h>
#endif #endif

2
src/Magnum/Text/GlyphCache.h
Unescape View File

@ -38,7 +38,7 @@
#include "Magnum/configure.h" #include "Magnum/configure.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#include "Magnum/Text/GlyphCacheGL.h" #include "Magnum/Text/GlyphCacheGL.h"

2
src/Magnum/Text/Text.h
Unescape View File

@ -33,7 +33,7 @@
#include "Magnum/Types.h" #include "Magnum/Types.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT

2
src/Magnum/TextureTools/Atlas.h
Unescape View File

@ -39,7 +39,7 @@
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include "Magnum/Math/Vector2.h" #include "Magnum/Math/Vector2.h"
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#include <Corrade/Utility/StlForwardVector.h> #include <Corrade/Utility/StlForwardVector.h>
#endif #endif

2
src/Magnum/TextureTools/DistanceField.h
Unescape View File

@ -38,7 +38,7 @@
#include "Magnum/configure.h" #include "Magnum/configure.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#include "Magnum/TextureTools/DistanceFieldGL.h" #include "Magnum/TextureTools/DistanceFieldGL.h"

2
src/Magnum/Trade/MaterialData.h
Unescape View File

@ -44,7 +44,7 @@
#include "Magnum/Trade/visibility.h" #include "Magnum/Trade/visibility.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
namespace Magnum { namespace Trade { namespace Magnum { namespace Trade {

2
src/Magnum/Trade/Trade.h
Unescape View File

@ -35,7 +35,7 @@
#include "Magnum/Magnum.h" #include "Magnum/Magnum.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h> #include <Corrade/Utility/DeprecationMacros.h>
#endif #endif
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT

4
src/Magnum/Vk/Enums.h
Unescape View File

@ -38,13 +38,13 @@
#include "Magnum/configure.h" #include "Magnum/configure.h"
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/DeprecationMacros.h>
#include "Magnum/Array.h" /* That's fine, we're deprecated too */ #include "Magnum/Array.h" /* That's fine, we're deprecated too */
#include "Magnum/Math/Vector3.h" #include "Magnum/Math/Vector3.h"
#include "Magnum/Vk/Vulkan.h" #include "Magnum/Vk/Vulkan.h"
#include "Magnum/Vk/visibility.h" #include "Magnum/Vk/visibility.h"
#include <Corrade/Utility/Macros.h>
#ifndef _MAGNUM_NO_DEPRECATED_VK_ENUMS #ifndef _MAGNUM_NO_DEPRECATED_VK_ENUMS
CORRADE_DEPRECATED_FILE("use headers corresponding to the suggested replacement APIs instead") CORRADE_DEPRECATED_FILE("use headers corresponding to the suggested replacement APIs instead")
#endif #endif

Write Preview
Loading…
Cancel
Save