Browse Source

GCC 4.5 compatibility: cannot silence warnings in functions.

What kind of half-assed feature is that?!
Vladimír Vondruš 12 years ago
parent
commit
677049d914
  1. 4
      src/Magnum/Framebuffer.cpp
  2. 4
      src/Magnum/Test/DebugGLTest.cpp

4
src/Magnum/Framebuffer.cpp

@ -221,12 +221,12 @@ Framebuffer& Framebuffer::attachTextureLayer(Framebuffer::BufferAttachment attac
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
Framebuffer& Framebuffer::attachTexture2D(BufferAttachment attachment, Texture2D& texture, Int mipLevel) { Framebuffer& Framebuffer::attachTexture2D(BufferAttachment attachment, Texture2D& texture, Int mipLevel) {
#ifdef __GNUC__ #if defined(__GNUC__) && !defined(CORRADE_GCC45_COMPATIBILITY)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif #endif
(this->*Context::current()->state().framebuffer->texture2DImplementation)(attachment, GLenum(texture.target()), texture.id(), mipLevel); (this->*Context::current()->state().framebuffer->texture2DImplementation)(attachment, GLenum(texture.target()), texture.id(), mipLevel);
#ifdef __GNUC__ #if defined(__GNUC__) && !defined(CORRADE_GCC45_COMPATIBILITY)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
return *this; return *this;

4
src/Magnum/Test/DebugGLTest.cpp

@ -111,12 +111,12 @@ void DebugGLTest::insertMessageFallback() {
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
void DebugGLTest::deprecated() { void DebugGLTest::deprecated() {
#ifdef __GNUC__ #if defined(__GNUC__) && !defined(CORRADE_GCC45_COMPATIBILITY)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif #endif
DebugMarker::mark("hello"); DebugMarker::mark("hello");
#ifdef __GNUC__ #if defined(__GNUC__) && !defined(CORRADE_GCC45_COMPATIBILITY)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif

Loading…
Cancel
Save