From 06f938fed83a79af91757d0740b6c1b86e01d803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 29 Apr 2015 20:13:41 +0200 Subject: [PATCH] Disable the deprecation warning also for MSVC. I long for the day when I can remove the old texture API. --- src/Magnum/Framebuffer.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Magnum/Framebuffer.cpp b/src/Magnum/Framebuffer.cpp index 635106c3c..87421e253 100644 --- a/src/Magnum/Framebuffer.cpp +++ b/src/Magnum/Framebuffer.cpp @@ -250,6 +250,10 @@ Framebuffer& Framebuffer::attachTextureLayer(Framebuffer::BufferAttachment attac #endif #ifdef MAGNUM_BUILD_DEPRECATED +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable: 4996) /* deprecated warning */ +#endif Framebuffer& Framebuffer::attachTexture2D(BufferAttachment attachment, Texture2D& texture, Int mipLevel) { #ifdef __GNUC__ #pragma GCC diagnostic push @@ -261,6 +265,9 @@ Framebuffer& Framebuffer::attachTexture2D(BufferAttachment attachment, Texture2D #endif return *this; } +#ifdef _MSC_VER +#pragma warning(pop) +#endif #endif void Framebuffer::renderbufferImplementationDefault(BufferAttachment attachment, Renderbuffer& renderbuffer) {