Browse Source

Merge branch 'master' into compatibility

Vladimír Vondruš 12 years ago
parent
commit
76427f0d7b
  1. 7
      src/Magnum/Framebuffer.cpp
  2. 7
      src/Magnum/Test/DebugGLTest.cpp

7
src/Magnum/Framebuffer.cpp

@ -221,7 +221,14 @@ 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__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#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__
#pragma GCC diagnostic pop
#endif
return *this; return *this;
} }
#endif #endif

7
src/Magnum/Test/DebugGLTest.cpp

@ -111,7 +111,14 @@ void DebugGLTest::insertMessageFallback() {
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
void DebugGLTest::deprecated() { void DebugGLTest::deprecated() {
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
DebugMarker::mark("hello"); DebugMarker::mark("hello");
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
} }

Loading…
Cancel
Save