From 53b7e178bdacb6926388121c849d113d70572ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 8 Jan 2025 12:53:22 +0100 Subject: [PATCH] Removed the MAGNUM_BUILD_MULTITHREADED macro deprecated in 2019.10. --- doc/changelog.dox | 3 +++ src/Magnum/Magnum.h | 8 -------- src/Magnum/configure.h.cmake | 6 ------ 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index aafe51be5..2e0cde1df 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -1745,6 +1745,9 @@ See also: - @cpp TextureTools::distanceField() @ce, use the @ref TextureTools::DistanceFieldGL class instead. - Removed APIs deprecated in 2019.10, in particular: + - @cpp MAGNUM_BUILD_MULTITHREADED @ce, use + @ref CORRADE_BUILD_MULTITHREADED instead (i.e., the feature is now + enabled consistently between Corrade and Magnum) - Templated @cpp Image*::data() @ce APIs returning a pointer which allowed for dangerous data access without any bounds, type or layout checks, use @ref Image::pixels() instead diff --git a/src/Magnum/Magnum.h b/src/Magnum/Magnum.h index 8a608eb5d..7caa66330 100644 --- a/src/Magnum/Magnum.h +++ b/src/Magnum/Magnum.h @@ -126,14 +126,6 @@ Enabled by default in a static build. On Windows see also the #define MAGNUM_BUILD_STATIC_UNIQUE_GLOBALS #undef MAGNUM_BUILD_STATIC_UNIQUE_GLOBALS -#ifdef MAGNUM_BUILD_DEPRECATED -/** @brief Multi-threaded build - * @m_deprecated_since{2019,10} Use @ref CORRADE_BUILD_MULTITHREADED instead. - */ -#define MAGNUM_BUILD_MULTITHREADED -#undef MAGNUM_BUILD_MULTITHREADED -#endif - /** @brief OpenGL interoperability diff --git a/src/Magnum/configure.h.cmake b/src/Magnum/configure.h.cmake index 5aa57b096..39d6ea318 100644 --- a/src/Magnum/configure.h.cmake +++ b/src/Magnum/configure.h.cmake @@ -38,12 +38,6 @@ #ifdef MAGNUM_BUILD_DEPRECATED #include "Corrade/configure.h" -#ifdef CORRADE_BUILD_MULTITHREADED -/* For compatibility only, to be removed at some point. Deliberate double space - after the #define to avoid being unconditionally matched by older FindMagnum - modules. */ -#define MAGNUM_BUILD_MULTITHREADED -#endif /* The following applies only to desktop platforms */ #if !defined(CORRADE_TARGET_IOS) && !defined(CORRADE_TARGET_ANDROID) && !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_WINDOWS_RT) /* MAGNUM_TARGET_HEADLESS used to be an option defined on desktop GL only, not