Browse Source

Use CORRADE_IGNORE_DEPRECATED_* where appropriate.

pull/233/head
Vladimír Vondruš 8 years ago
parent
commit
c249698c7b
  1. 9
      src/Magnum/Buffer.h

9
src/Magnum/Buffer.h

@ -1361,10 +1361,7 @@ inline GLuint Buffer::release() {
} }
#if !defined(MAGNUM_TARGET_GLES) && defined(MAGNUM_BUILD_DEPRECATED) #if !defined(MAGNUM_TARGET_GLES) && defined(MAGNUM_BUILD_DEPRECATED)
#ifdef __GNUC__ CORRADE_IGNORE_DEPRECATED_PUSH
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
template<class T> Containers::Array<T> inline Buffer::data() { template<class T> Containers::Array<T> inline Buffer::data() {
const Int bufferSize = size(); 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); 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<class T> Containers::Array<T> inline Buffer::subData(const GLintptr off
if(size) subDataInternal(offset, size*sizeof(T), data); if(size) subDataInternal(offset, size*sizeof(T), data);
return data; return data;
} }
#ifdef __GNUC__ CORRADE_IGNORE_DEPRECATED_POP
#pragma GCC diagnostic pop
#endif
#endif #endif
} }

Loading…
Cancel
Save