From 350531f2abed84acc6ba3b6356464c1e95b6f25a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 8 Jan 2023 17:34:37 +0100 Subject: [PATCH] Shaders: define enum set operators right next to the typedef. And not somewhere completely different. --- src/Magnum/Shaders/DistanceFieldVectorGL.h | 2 +- src/Magnum/Shaders/FlatGL.h | 2 +- src/Magnum/Shaders/VectorGL.h | 2 +- src/Magnum/Shaders/VertexColorGL.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Magnum/Shaders/DistanceFieldVectorGL.h b/src/Magnum/Shaders/DistanceFieldVectorGL.h index f8cc95202..24e466454 100644 --- a/src/Magnum/Shaders/DistanceFieldVectorGL.h +++ b/src/Magnum/Shaders/DistanceFieldVectorGL.h @@ -50,6 +50,7 @@ namespace Implementation { #endif }; typedef Containers::EnumSet DistanceFieldVectorGLFlags; + CORRADE_ENUMSET_OPERATORS(DistanceFieldVectorGLFlags) } /** @@ -781,7 +782,6 @@ template Debug& operator<<(Debug& debug, DistanceFieldVe namespace Implementation { MAGNUM_SHADERS_EXPORT Debug& operator<<(Debug& debug, DistanceFieldVectorGLFlag value); MAGNUM_SHADERS_EXPORT Debug& operator<<(Debug& debug, DistanceFieldVectorGLFlags value); - CORRADE_ENUMSET_OPERATORS(DistanceFieldVectorGLFlags) } #endif diff --git a/src/Magnum/Shaders/FlatGL.h b/src/Magnum/Shaders/FlatGL.h index af3ec0a63..939642ccb 100644 --- a/src/Magnum/Shaders/FlatGL.h +++ b/src/Magnum/Shaders/FlatGL.h @@ -66,6 +66,7 @@ namespace Implementation { #endif }; typedef Containers::EnumSet FlatGLFlags; + CORRADE_ENUMSET_OPERATORS(FlatGLFlags) } /** @@ -1560,7 +1561,6 @@ template Debug& operator<<(Debug& debug, FlatGL VectorGLFlags; + CORRADE_ENUMSET_OPERATORS(VectorGLFlags) } /** @@ -731,7 +732,6 @@ template Debug& operator<<(Debug& debug, VectorGL VertexColorGLFlags; + CORRADE_ENUMSET_OPERATORS(VertexColorGLFlags) } /** @@ -548,7 +549,6 @@ template Debug& operator<<(Debug& debug, VertexColorGL