Browse Source

Removed the MAGNUM_BUILD_MULTITHREADED macro deprecated in 2019.10.

pull/659/head
Vladimír Vondruš 1 year ago
parent
commit
53b7e178bd
  1. 3
      doc/changelog.dox
  2. 8
      src/Magnum/Magnum.h
  3. 6
      src/Magnum/configure.h.cmake

3
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

8
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

6
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

Loading…
Cancel
Save