From c249698c7b79840921ad66ad6b767de70fdff47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 28 Apr 2018 01:13:25 +0200 Subject: [PATCH] Use CORRADE_IGNORE_DEPRECATED_* where appropriate. --- src/Magnum/Buffer.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Magnum/Buffer.h b/src/Magnum/Buffer.h index c5afc43ed..81f4b7849 100644 --- a/src/Magnum/Buffer.h +++ b/src/Magnum/Buffer.h @@ -1361,10 +1361,7 @@ inline GLuint Buffer::release() { } #if !defined(MAGNUM_TARGET_GLES) && defined(MAGNUM_BUILD_DEPRECATED) -#ifdef __GNUC__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif +CORRADE_IGNORE_DEPRECATED_PUSH template Containers::Array inline Buffer::data() { const Int bufferSize = size(); CORRADE_ASSERT(bufferSize%sizeof(T) == 0, "Buffer::data(): the buffer size is" << bufferSize << "bytes, which can't be expressed as array of types with size" << sizeof(T), nullptr); @@ -1376,9 +1373,7 @@ template Containers::Array inline Buffer::subData(const GLintptr off if(size) subDataInternal(offset, size*sizeof(T), data); return data; } -#ifdef __GNUC__ -#pragma GCC diagnostic pop -#endif +CORRADE_IGNORE_DEPRECATED_POP #endif }