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

4 months ago · 2ea43a8c5e
36 changed files with 38 additions and 38 deletions
--- a/src/Magnum/Array.h
+++ b/src/Magnum/Array.h
@ -39,7 +39,7 @@
 #include <type_traits>
 #include <Corrade/Containers/sequenceHelpers.h>
 #include <Corrade/Utility/Debug.h>
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>

 #include "Magnum/Magnum.h"
 #include "Magnum/Math/Vector3.h"
--- a/src/Magnum/DebugTools/BufferData.h
+++ b/src/Magnum/DebugTools/BufferData.h
@ -54,7 +54,7 @@

 #ifdef MAGNUM_BUILD_DEPRECATED
 #include <Corrade/Containers/Array.h>
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>

 #include "Magnum/GL/Buffer.h"
 #endif
--- a/src/Magnum/DebugTools/DebugTools.h
+++ b/src/Magnum/DebugTools/DebugTools.h
@ -33,7 +33,7 @@
 #include "Magnum/Types.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #endif

 #ifndef DOXYGEN_GENERATING_OUTPUT
--- a/src/Magnum/DebugTools/Profiler.h
+++ b/src/Magnum/DebugTools/Profiler.h
@ -42,7 +42,7 @@
 #include <initializer_list>
 #include <string>
 #include <vector>
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>

 #include "Magnum/Types.h"
 #include "Magnum/DebugTools/visibility.h"
--- a/src/Magnum/GL/AbstractShaderProgram.h
+++ b/src/Magnum/GL/AbstractShaderProgram.h
@ -41,7 +41,7 @@
 #endif

 #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>,
   and draw({MeshView}) as well */
 #include <Corrade/Containers/Iterable.h>
--- a/src/Magnum/GL/Attribute.h
+++ b/src/Magnum/GL/Attribute.h
@ -38,7 +38,7 @@
 #include "Magnum/Math/TypeTraits.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #endif

 namespace Magnum { namespace GL {
--- a/src/Magnum/GL/PixelFormat.h
+++ b/src/Magnum/GL/PixelFormat.h
@ -37,7 +37,7 @@
 #include "Magnum/GL/visibility.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #endif

 namespace Magnum { namespace GL {
--- a/src/Magnum/GL/Renderer.h
+++ b/src/Magnum/GL/Renderer.h
@ -38,7 +38,7 @@
 #include "Magnum/GL/visibility.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #endif

 namespace Magnum { namespace GL {
--- a/src/Magnum/GL/Shader.h
+++ b/src/Magnum/GL/Shader.h
@ -38,7 +38,7 @@
 #include "Magnum/GL/GL.h"

 #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
   std::string. Not ideal for the return types, but at least something. */
 #include <Corrade/Containers/StringStl.h>
--- a/src/Magnum/Magnum.h
+++ b/src/Magnum/Magnum.h
@ -36,7 +36,7 @@
 #include "Magnum/Math/Math.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #endif

 namespace Magnum {
--- a/src/Magnum/MaterialTools/PhongToPbrMetallicRoughness.h
+++ b/src/Magnum/MaterialTools/PhongToPbrMetallicRoughness.h
@ -38,7 +38,7 @@
 #include "Magnum/Trade/Trade.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #endif

 namespace Magnum { namespace MaterialTools {
--- a/src/Magnum/Math/BoolVector.h
+++ b/src/Magnum/Math/BoolVector.h
@ -37,7 +37,7 @@
 #include "Magnum/configure.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>

 #include "Magnum/Math/BitVector.h"

--- a/src/Magnum/Math/Math.h
+++ b/src/Magnum/Math/Math.h
@ -35,7 +35,7 @@
 #include "Magnum/Types.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #endif

 #ifndef DOXYGEN_GENERATING_OUTPUT
--- a/src/Magnum/Math/Tags.h
+++ b/src/Magnum/Math/Tags.h
@ -33,7 +33,7 @@
 #include "Magnum/Tags.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #endif

 namespace Magnum { namespace Math {
--- a/src/Magnum/Math/TypeTraits.h
+++ b/src/Magnum/Math/TypeTraits.h
@ -37,7 +37,7 @@
 #include "Magnum/Types.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #endif

 #ifdef MAGNUM_BUILD_DEPRECATED
--- a/src/Magnum/MeshTools/CombineIndexedArrays.h
+++ b/src/Magnum/MeshTools/CombineIndexedArrays.h
@ -41,7 +41,7 @@
 #include <tuple>
 #include <vector>
 #include <Corrade/Utility/Assert.h>
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>

 #include "Magnum/Types.h"
 #include "Magnum/MeshTools/visibility.h"
--- a/src/Magnum/MeshTools/Compile.h
+++ b/src/Magnum/MeshTools/Compile.h
@ -43,7 +43,7 @@
 #include "Magnum/MeshTools/visibility.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #endif

 namespace Magnum { namespace MeshTools {
--- a/src/Magnum/MeshTools/CompressIndices.h
+++ b/src/Magnum/MeshTools/CompressIndices.h
@ -37,7 +37,7 @@
 #include "Magnum/Trade/Trade.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #include <Corrade/Utility/StlForwardVector.h>
 #include <Corrade/Utility/StlForwardTuple.h>

--- a/src/Magnum/MeshTools/FilterAttributes.h
+++ b/src/Magnum/MeshTools/FilterAttributes.h
@ -36,7 +36,7 @@
 #include "Magnum/configure.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>

 #include "Magnum/MeshTools/Filter.h"

--- a/src/Magnum/MeshTools/FlipNormals.h
+++ b/src/Magnum/MeshTools/FlipNormals.h
@ -36,10 +36,10 @@
 #include "Magnum/MeshTools/visibility.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/StlForwardVector.h>
 #include <Corrade/Containers/ArrayViewStl.h>
 #include <Corrade/Containers/StridedArrayView.h>
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
+#include <Corrade/Utility/StlForwardVector.h>
 #endif

 namespace Magnum { namespace MeshTools {
--- a/src/Magnum/MeshTools/Reference.h
+++ b/src/Magnum/MeshTools/Reference.h
@ -36,7 +36,7 @@
 #include "Magnum/configure.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>

 #include "Magnum/MeshTools/Copy.h"

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

 namespace Magnum { namespace MeshTools {
--- a/src/Magnum/PixelFormat.h
+++ b/src/Magnum/PixelFormat.h
@ -36,7 +36,7 @@
 #include "Magnum/visibility.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #endif

 namespace Magnum {
--- a/src/Magnum/Platform/EmscriptenApplication.h
+++ b/src/Magnum/Platform/EmscriptenApplication.h
@ -52,9 +52,9 @@
 #endif

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
 /* Some APIs used to take or return a std::string before */
 #include <Corrade/Containers/StringStl.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #endif

 #if defined(CORRADE_TARGET_EMSCRIPTEN) || defined(DOXYGEN_GENERATING_OUTPUT)
--- a/src/Magnum/SceneTools/FlattenMeshHierarchy.h
+++ b/src/Magnum/SceneTools/FlattenMeshHierarchy.h
@ -39,7 +39,7 @@
 #include "Magnum/configure.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>

 #include "Magnum/Magnum.h"
 #include "Magnum/Math/Matrix3.h"
--- a/src/Magnum/SceneTools/FlattenTransformationHierarchy.h
+++ b/src/Magnum/SceneTools/FlattenTransformationHierarchy.h
@ -40,7 +40,7 @@

 #ifdef MAGNUM_BUILD_DEPRECATED
 #include <Corrade/Containers/Array.h>
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>

 #include "Magnum/Math/Matrix3.h"
 #include "Magnum/Math/Matrix4.h"
--- a/src/Magnum/SceneTools/OrderClusterParents.h
+++ b/src/Magnum/SceneTools/OrderClusterParents.h
@ -39,7 +39,7 @@

 #ifdef MAGNUM_BUILD_DEPRECATED
 #include <Corrade/Containers/Array.h>
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>

 #include "Magnum/SceneTools/Hierarchy.h"

--- a/src/Magnum/Shaders/Shaders.h
+++ b/src/Magnum/Shaders/Shaders.h
@ -33,7 +33,7 @@
 #include "Magnum/Types.h"

 #if defined(MAGNUM_TARGET_GL) && defined(MAGNUM_BUILD_DEPRECATED)
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #endif

 #ifndef DOXYGEN_GENERATING_OUTPUT
--- a/src/Magnum/Text/AbstractGlyphCache.h
+++ b/src/Magnum/Text/AbstractGlyphCache.h
@ -42,7 +42,7 @@

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

--- a/src/Magnum/Text/GlyphCache.h
+++ b/src/Magnum/Text/GlyphCache.h
@ -38,7 +38,7 @@
 #include "Magnum/configure.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>

 #include "Magnum/Text/GlyphCacheGL.h"

--- a/src/Magnum/Text/Text.h
+++ b/src/Magnum/Text/Text.h
@ -33,7 +33,7 @@
 #include "Magnum/Types.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #endif

 #ifndef DOXYGEN_GENERATING_OUTPUT
--- a/src/Magnum/TextureTools/Atlas.h
+++ b/src/Magnum/TextureTools/Atlas.h
@ -39,7 +39,7 @@
 #ifdef MAGNUM_BUILD_DEPRECATED
 #include "Magnum/Math/Vector2.h"

-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #include <Corrade/Utility/StlForwardVector.h>
 #endif

--- a/src/Magnum/TextureTools/DistanceField.h
+++ b/src/Magnum/TextureTools/DistanceField.h
@ -38,7 +38,7 @@
 #include "Magnum/configure.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>

 #include "Magnum/TextureTools/DistanceFieldGL.h"

--- a/src/Magnum/Trade/MaterialData.h
+++ b/src/Magnum/Trade/MaterialData.h
@ -44,7 +44,7 @@
 #include "Magnum/Trade/visibility.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #endif

 namespace Magnum { namespace Trade {
--- a/src/Magnum/Trade/Trade.h
+++ b/src/Magnum/Trade/Trade.h
@ -35,7 +35,7 @@
 #include "Magnum/Magnum.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include <Corrade/Utility/DeprecationMacros.h>
 #endif

 #ifndef DOXYGEN_GENERATING_OUTPUT
--- a/src/Magnum/Vk/Enums.h
+++ b/src/Magnum/Vk/Enums.h
@ -38,13 +38,13 @@
 #include "Magnum/configure.h"

 #ifdef MAGNUM_BUILD_DEPRECATED
+#include <Corrade/Utility/DeprecationMacros.h>
+
 #include "Magnum/Array.h" /* That's fine, we're deprecated too */
 #include "Magnum/Math/Vector3.h"
 #include "Magnum/Vk/Vulkan.h"
 #include "Magnum/Vk/visibility.h"

-#include <Corrade/Utility/Macros.h>
-
 #ifndef _MAGNUM_NO_DEPRECATED_VK_ENUMS
 CORRADE_DEPRECATED_FILE("use headers corresponding to the suggested replacement APIs instead")
 #endif