Browse Source

GL: use CORRADE_IGNORE_DEPRECATED macros where applicable.

pull/297/head
Vladimír Vondruš 8 years ago
parent
commit
31b7a39e9d
  1. 28
      src/Magnum/GL/Test/PixelFormatTest.cpp

28
src/Magnum/GL/Test/PixelFormatTest.cpp

@ -158,13 +158,7 @@ void PixelFormatTest::mapFormatType() {
case Magnum::PixelFormat::value: \ case Magnum::PixelFormat::value: \
CORRADE_VERIFY(UnsignedInt(Magnum::PixelFormat::value) >= 0x1000); \ CORRADE_VERIFY(UnsignedInt(Magnum::PixelFormat::value) >= 0x1000); \
continue; continue;
#ifdef __GNUC__ CORRADE_IGNORE_DEPRECATED_PUSH
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#elif defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable: 4996)
#endif
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2)) #if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
_c(Red) _c(Red)
#endif #endif
@ -213,11 +207,7 @@ void PixelFormatTest::mapFormatType() {
#endif #endif
_c(DepthStencil) _c(DepthStencil)
#undef _c #undef _c
#ifdef __GNUC__ CORRADE_IGNORE_DEPRECATED_POP
#pragma GCC diagnostic pop
#elif defined(_MSC_VER)
#pragma warning(pop)
#endif
#endif #endif
} }
@ -398,13 +388,7 @@ void PixelFormatTest::mapCompressedFormat() {
case Magnum::CompressedPixelFormat::value: \ case Magnum::CompressedPixelFormat::value: \
CORRADE_VERIFY(UnsignedInt(Magnum::CompressedPixelFormat::value) >= 0x1000); \ CORRADE_VERIFY(UnsignedInt(Magnum::CompressedPixelFormat::value) >= 0x1000); \
continue; continue;
#ifdef __GNUC__ CORRADE_IGNORE_DEPRECATED_PUSH
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#elif defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable: 4996)
#endif
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
_c(Red) _c(Red)
_c(RG) _c(RG)
@ -466,11 +450,7 @@ void PixelFormatTest::mapCompressedFormat() {
_c(SRGB8Alpha8Astc12x12) _c(SRGB8Alpha8Astc12x12)
#endif #endif
#undef _c #undef _c
#ifdef __GNUC__ CORRADE_IGNORE_DEPRECATED_POP
#pragma GCC diagnostic pop
#elif defined(_MSC_VER)
#pragma warning(pop)
#endif
#endif #endif
} }

Loading…
Cancel
Save