From 1a6037ff5dabd002115b4499993cb871623f4063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 19 Aug 2012 21:23:06 +0200 Subject: [PATCH] Adapted to Corrade changes, added operators for enum sets. --- src/Contexts/AbstractXContext.h | 3 +++ src/Framebuffer.h | 3 +++ src/Trade/AbstractImporter.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Contexts/AbstractXContext.h b/src/Contexts/AbstractXContext.h index 3f30bee54..4bfd3eee6 100644 --- a/src/Contexts/AbstractXContext.h +++ b/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&) {} inline void AbstractXContext::keyReleaseEvent(Key, Modifiers, const Math::Vector2&) {} inline void AbstractXContext::mousePressEvent(MouseButton, Modifiers, const Math::Vector2&) {} diff --git a/src/Framebuffer.h b/src/Framebuffer.h index 4df94c9bf..427dcca32 100644 --- a/src/Framebuffer.h +++ b/src/Framebuffer.h @@ -1111,6 +1111,9 @@ class MAGNUM_EXPORT Framebuffer { GLuint framebuffer; }; +CORRADE_ENUMSET_OPERATORS(Framebuffer::ClearMask) +CORRADE_ENUMSET_OPERATORS(Framebuffer::BlitMask) + } #endif diff --git a/src/Trade/AbstractImporter.h b/src/Trade/AbstractImporter.h index 0258b2b32..2b7ed2528 100644 --- a/src/Trade/AbstractImporter.h +++ b/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; }