Browse Source

Adapted to Corrade changes, added operators for enum sets.

vectorfields
Vladimír Vondruš 14 years ago
parent
commit
1a6037ff5d
  1. 3
      src/Contexts/AbstractXContext.h
  2. 3
      src/Framebuffer.h
  3. 2
      src/Trade/AbstractImporter.h

3
src/Contexts/AbstractXContext.h

@ -257,6 +257,9 @@ class AbstractXContext: public AbstractContext {
bool _redraw;
};
CORRADE_ENUMSET_OPERATORS(AbstractXContext::Modifiers)
/* Implementations for inline functions with unused parameters */
inline void AbstractXContext::keyPressEvent(Key, Modifiers, const Math::Vector2<int>&) {}
inline void AbstractXContext::keyReleaseEvent(Key, Modifiers, const Math::Vector2<int>&) {}
inline void AbstractXContext::mousePressEvent(MouseButton, Modifiers, const Math::Vector2<int>&) {}

3
src/Framebuffer.h

@ -1111,6 +1111,9 @@ class MAGNUM_EXPORT Framebuffer {
GLuint framebuffer;
};
CORRADE_ENUMSET_OPERATORS(Framebuffer::ClearMask)
CORRADE_ENUMSET_OPERATORS(Framebuffer::BlitMask)
}
#endif

2
src/Trade/AbstractImporter.h

@ -310,7 +310,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin {
/*@}*/
};
SET_OPERATORS(AbstractImporter::Features)
CORRADE_ENUMSET_OPERATORS(AbstractImporter::Features)
/* Implementations for inline functions with unused parameters */
inline int AbstractImporter::sceneForName(const std::string&) { return -1; }

Loading…
Cancel
Save