Browse Source

Platform: using new type aliases in whole Platform namespace.

pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
006dbf417a
  1. 4
      src/Platform/NaClApplication.h
  2. 4
      src/Platform/Sdl2Application.h

4
src/Platform/NaClApplication.h

@ -176,7 +176,7 @@ class NaClApplication: public pp::Instance, public pp::Graphics3DClient, public
/*@}*/ /*@}*/
private: private:
enum class Flag: std::uint8_t { enum class Flag: UnsignedByte {
ViewportUpdated = 1 << 0, ViewportUpdated = 1 << 0,
SwapInProgress = 1 << 1, SwapInProgress = 1 << 1,
Redraw = 1 << 2, Redraw = 1 << 2,
@ -184,7 +184,7 @@ class NaClApplication: public pp::Instance, public pp::Graphics3DClient, public
WillBeFullscreen = 1 << 4, WillBeFullscreen = 1 << 4,
MouseLocked = 1 << 5 MouseLocked = 1 << 5
}; };
typedef Corrade::Containers::EnumSet<Flag, std::uint8_t> Flags; typedef Corrade::Containers::EnumSet<Flag, UnsignedByte> Flags;
inline void Graphics3DContextLost() override { inline void Graphics3DContextLost() override {
CORRADE_ASSERT(false, "NaClApplication: context unexpectedly lost", ); CORRADE_ASSERT(false, "NaClApplication: context unexpectedly lost", );

4
src/Platform/Sdl2Application.h

@ -152,12 +152,12 @@ class Sdl2Application {
/*@}*/ /*@}*/
private: private:
enum class Flag: std::uint8_t { enum class Flag: UnsignedByte {
Redraw = 1 << 0, Redraw = 1 << 0,
Exit = 1 << 1 Exit = 1 << 1
}; };
typedef Corrade::Containers::EnumSet<Flag, unsigned int> Flags; typedef Corrade::Containers::EnumSet<Flag, UnsignedByte> Flags;
CORRADE_ENUMSET_FRIEND_OPERATORS(Flags) CORRADE_ENUMSET_FRIEND_OPERATORS(Flags)
SDL_Window* window; SDL_Window* window;

Loading…
Cancel
Save