From a14be9b154f2bbc2735ac1430fa1f46d50dfaf70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 27 Jul 2019 01:09:52 +0200 Subject: [PATCH] Adapt to (breaking) Corrade changes. --- src/Magnum/GL/Context.h | 1 - src/Magnum/Platform/AbstractXApplication.h | 2 -- src/Magnum/Platform/AndroidApplication.h | 2 -- src/Magnum/Platform/EmscriptenApplication.h | 2 -- src/Magnum/Platform/GlfwApplication.h | 2 -- src/Magnum/Platform/Sdl2Application.h | 1 - 6 files changed, 10 deletions(-) diff --git a/src/Magnum/GL/Context.h b/src/Magnum/GL/Context.h index f7cf89367..1f9543f7a 100644 --- a/src/Magnum/GL/Context.h +++ b/src/Magnum/GL/Context.h @@ -774,7 +774,6 @@ CORRADE_ENUMSET_OPERATORS(Context::Flags) #endif CORRADE_ENUMSET_OPERATORS(Context::DetectedDrivers) CORRADE_ENUMSET_OPERATORS(Context::States) -CORRADE_ENUMSET_OPERATORS(Context::InternalFlags) #ifndef MAGNUM_TARGET_WEBGL /** @debugoperatorclassenum{Context,Context::Flag} */ diff --git a/src/Magnum/Platform/AbstractXApplication.h b/src/Magnum/Platform/AbstractXApplication.h index f7d44f206..2c08247c0 100644 --- a/src/Magnum/Platform/AbstractXApplication.h +++ b/src/Magnum/Platform/AbstractXApplication.h @@ -272,8 +272,6 @@ class AbstractXApplication { Flags _flags; }; -CORRADE_ENUMSET_OPERATORS(AbstractXApplication::Flags) - /** @brief OpenGL context configuration diff --git a/src/Magnum/Platform/AndroidApplication.h b/src/Magnum/Platform/AndroidApplication.h index e7ebbf55a..99a6bd6ca 100644 --- a/src/Magnum/Platform/AndroidApplication.h +++ b/src/Magnum/Platform/AndroidApplication.h @@ -423,8 +423,6 @@ class AndroidApplication { CORRADE_ENUMSET_FRIEND_OPERATORS(Flags) }; -CORRADE_ENUMSET_OPERATORS(AndroidApplication::Flags) - /** @brief OpenGL context configuration diff --git a/src/Magnum/Platform/EmscriptenApplication.h b/src/Magnum/Platform/EmscriptenApplication.h index 4f2fc142e..d3ca29890 100644 --- a/src/Magnum/Platform/EmscriptenApplication.h +++ b/src/Magnum/Platform/EmscriptenApplication.h @@ -647,8 +647,6 @@ class EmscriptenApplication { int (*_callback)(void*); }; -CORRADE_ENUMSET_OPERATORS(EmscriptenApplication::Flags) - #ifdef MAGNUM_TARGET_GL /** @brief WebGL context configuration diff --git a/src/Magnum/Platform/GlfwApplication.h b/src/Magnum/Platform/GlfwApplication.h index 9bd4aa595..a96826884 100644 --- a/src/Magnum/Platform/GlfwApplication.h +++ b/src/Magnum/Platform/GlfwApplication.h @@ -581,8 +581,6 @@ class GlfwApplication { Vector2i _maxWindowSize; }; -CORRADE_ENUMSET_OPERATORS(GlfwApplication::Flags) - #ifdef MAGNUM_TARGET_GL /** @brief OpenGL context configuration diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index 0a8c973cf..c981c5d2a 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -2477,7 +2477,6 @@ typedef BasicScreenedApplication ScreenedApplication; #endif #endif -CORRADE_ENUMSET_OPERATORS(Sdl2Application::Flags) CORRADE_ENUMSET_OPERATORS(Sdl2Application::Configuration::WindowFlags) CORRADE_ENUMSET_OPERATORS(Sdl2Application::InputEvent::Modifiers) CORRADE_ENUMSET_OPERATORS(Sdl2Application::MouseMoveEvent::Buttons)