From 3744d247d2be63ecf9a4cb1b1edbaeb8e3c251ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 17 Aug 2012 11:51:54 +0200 Subject: [PATCH] Adapted to Corrade changes. --- src/Framebuffer.h | 6 +++--- src/Trade/AbstractImporter.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Framebuffer.h b/src/Framebuffer.h index 149583b54..7e6b16772 100644 --- a/src/Framebuffer.h +++ b/src/Framebuffer.h @@ -19,7 +19,7 @@ * @brief Class Magnum::Framebuffer */ -#include +#include #include "BufferedImage.h" #include "CubeMapTexture.h" @@ -111,7 +111,7 @@ class MAGNUM_EXPORT Framebuffer { Stencil = GL_STENCIL_BUFFER_BIT /**< Stencil value */ }; - typedef Corrade::Utility::Set ClearMask; /**< @brief Mask for clearing */ + typedef Corrade::Containers::Set ClearMask; /**< @brief Mask for clearing */ /** * @brief Clear framebuffer @@ -1011,7 +1011,7 @@ class MAGNUM_EXPORT Framebuffer { * @requires_gl * @requires_gl30 Extension @extension{EXT,framebuffer_object} */ - typedef Corrade::Utility::Set BlitMask; + typedef Corrade::Containers::Set BlitMask; /** * @brief Copy block of pixels from read to draw framebuffer diff --git a/src/Trade/AbstractImporter.h b/src/Trade/AbstractImporter.h index 03f3d0729..f978f6e94 100644 --- a/src/Trade/AbstractImporter.h +++ b/src/Trade/AbstractImporter.h @@ -19,7 +19,7 @@ * @brief Class Magnum::Trade::AbstractImporter */ -#include +#include #include #include "ImageData.h" @@ -65,7 +65,7 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { }; /** @brief Set of features supported by this importer */ - typedef Corrade::Utility::Set Features; + typedef Corrade::Containers::Set Features; /** @brief Constructor */ inline AbstractImporter(Corrade::PluginManager::AbstractPluginManager* manager = nullptr, const std::string& plugin = ""): Plugin(manager, plugin) {}