From df3184f0bcecb9cc2f66b535d9a7998714c2bb6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 23 Feb 2021 18:55:23 +0100 Subject: [PATCH] Platform: remove full value specification from Flags EnumSets. I don't see any use case for just specifying "all the flags", mainly because the flags are mutually conflicting and whatnot. Also, these go outdated *fast*. --- src/Magnum/Platform/Sdl2Application.h | 9 --------- src/Magnum/Platform/WindowlessEglApplication.h | 8 -------- src/Magnum/Platform/WindowlessGlxApplication.h | 8 -------- src/Magnum/Platform/WindowlessWglApplication.h | 8 -------- src/Magnum/Platform/WindowlessWindowsEglApplication.h | 4 ---- 5 files changed, 37 deletions(-) diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index 20c619c57..ec37791f6 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -1269,17 +1269,8 @@ class Sdl2Application::GLConfiguration { * @see @ref setFlags(), @ref GL::Context::Flags * @requires_gles Context flags are not available in WebGL. */ - #ifndef DOXYGEN_GENERATING_OUTPUT - typedef Containers::EnumSet Flags; - #else typedef Containers::EnumSet Flags; #endif - #endif explicit GLConfiguration(); ~GLConfiguration(); diff --git a/src/Magnum/Platform/WindowlessEglApplication.h b/src/Magnum/Platform/WindowlessEglApplication.h index 91b4a4604..e9b9f06bb 100644 --- a/src/Magnum/Platform/WindowlessEglApplication.h +++ b/src/Magnum/Platform/WindowlessEglApplication.h @@ -213,16 +213,8 @@ class WindowlessEglContext::Configuration { * @see @ref setFlags(), @ref Context::Flags * @requires_gles Context flags are not available in WebGL. */ - #ifndef DOXYGEN_GENERATING_OUTPUT - typedef Containers::EnumSet Flags; - #else typedef Containers::EnumSet Flags; #endif - #endif /*implicit*/ Configuration(); diff --git a/src/Magnum/Platform/WindowlessGlxApplication.h b/src/Magnum/Platform/WindowlessGlxApplication.h index 68dc2d591..2647d7fac 100644 --- a/src/Magnum/Platform/WindowlessGlxApplication.h +++ b/src/Magnum/Platform/WindowlessGlxApplication.h @@ -216,15 +216,7 @@ class WindowlessGlxContext::Configuration { * * @see @ref setFlags(), @ref Context::Flags */ - #ifndef DOXYGEN_GENERATING_OUTPUT - typedef Containers::EnumSet Flags; - #else typedef Containers::EnumSet Flags; - #endif /*implicit*/ Configuration(); diff --git a/src/Magnum/Platform/WindowlessWglApplication.h b/src/Magnum/Platform/WindowlessWglApplication.h index 5deb05a9c..3ff1021b0 100644 --- a/src/Magnum/Platform/WindowlessWglApplication.h +++ b/src/Magnum/Platform/WindowlessWglApplication.h @@ -203,15 +203,7 @@ class WindowlessWglContext::Configuration { * * @see @ref setFlags(), @ref Context::Flags */ - #ifndef DOXYGEN_GENERATING_OUTPUT - typedef Containers::EnumSet Flags; - #else typedef Containers::EnumSet Flags; - #endif /*implicit*/ Configuration(); diff --git a/src/Magnum/Platform/WindowlessWindowsEglApplication.h b/src/Magnum/Platform/WindowlessWindowsEglApplication.h index 589be9571..06c209bb0 100644 --- a/src/Magnum/Platform/WindowlessWindowsEglApplication.h +++ b/src/Magnum/Platform/WindowlessWindowsEglApplication.h @@ -179,11 +179,7 @@ class WindowlessWindowsEglContext::Configuration { * * @see @ref setFlags(), @ref Context::Flags */ - #ifndef DOXYGEN_GENERATING_OUTPUT - typedef Containers::EnumSet Flags; - #else typedef Containers::EnumSet Flags; - #endif constexpr /*implicit*/ Configuration() {}