Browse Source

Shaders: define enum set operators right next to the typedef.

And not somewhere completely different.
pull/601/head
Vladimír Vondruš 3 years ago
parent
commit
350531f2ab
  1. 2
      src/Magnum/Shaders/DistanceFieldVectorGL.h
  2. 2
      src/Magnum/Shaders/FlatGL.h
  3. 2
      src/Magnum/Shaders/VectorGL.h
  4. 2
      src/Magnum/Shaders/VertexColorGL.h

2
src/Magnum/Shaders/DistanceFieldVectorGL.h

@ -50,6 +50,7 @@ namespace Implementation {
#endif
};
typedef Containers::EnumSet<DistanceFieldVectorGLFlag> DistanceFieldVectorGLFlags;
CORRADE_ENUMSET_OPERATORS(DistanceFieldVectorGLFlags)
}
/**
@ -781,7 +782,6 @@ template<UnsignedInt dimensions> 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

2
src/Magnum/Shaders/FlatGL.h

@ -66,6 +66,7 @@ namespace Implementation {
#endif
};
typedef Containers::EnumSet<FlatGLFlag> FlatGLFlags;
CORRADE_ENUMSET_OPERATORS(FlatGLFlags)
}
/**
@ -1560,7 +1561,6 @@ template<UnsignedInt dimensions> Debug& operator<<(Debug& debug, FlatGL<dimensio
namespace Implementation {
MAGNUM_SHADERS_EXPORT Debug& operator<<(Debug& debug, FlatGLFlag value);
MAGNUM_SHADERS_EXPORT Debug& operator<<(Debug& debug, FlatGLFlags value);
CORRADE_ENUMSET_OPERATORS(FlatGLFlags)
}
#endif

2
src/Magnum/Shaders/VectorGL.h

@ -50,6 +50,7 @@ namespace Implementation {
#endif
};
typedef Containers::EnumSet<VectorGLFlag> VectorGLFlags;
CORRADE_ENUMSET_OPERATORS(VectorGLFlags)
}
/**
@ -731,7 +732,6 @@ template<UnsignedInt dimensions> Debug& operator<<(Debug& debug, VectorGL<dimens
namespace Implementation {
MAGNUM_SHADERS_EXPORT Debug& operator<<(Debug& debug, VectorGLFlag value);
MAGNUM_SHADERS_EXPORT Debug& operator<<(Debug& debug, VectorGLFlags value);
CORRADE_ENUMSET_OPERATORS(VectorGLFlags)
}
#endif

2
src/Magnum/Shaders/VertexColorGL.h

@ -49,6 +49,7 @@ namespace Implementation {
#endif
};
typedef Containers::EnumSet<VertexColorGLFlag> VertexColorGLFlags;
CORRADE_ENUMSET_OPERATORS(VertexColorGLFlags)
}
/**
@ -548,7 +549,6 @@ template<UnsignedInt dimensions> Debug& operator<<(Debug& debug, VertexColorGL<d
namespace Implementation {
MAGNUM_SHADERS_EXPORT Debug& operator<<(Debug& debug, VertexColorGLFlag value);
MAGNUM_SHADERS_EXPORT Debug& operator<<(Debug& debug, VertexColorGLFlags value);
CORRADE_ENUMSET_OPERATORS(VertexColorGLFlags)
}
#endif

Loading…
Cancel
Save