From 5ddd9d16f8d66308281806dee98be921d83933a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 20 Feb 2014 13:15:55 +0100 Subject: [PATCH] GCC 4.7 compatibility: hide deprecated warnings in internal code. --- src/Magnum/SceneGraph/Object.hpp | 35 ++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/Magnum/SceneGraph/Object.hpp b/src/Magnum/SceneGraph/Object.hpp index 6716902e2..876d3653e 100644 --- a/src/Magnum/SceneGraph/Object.hpp +++ b/src/Magnum/SceneGraph/Object.hpp @@ -52,7 +52,14 @@ template void AbstractObject::se #ifdef CORRADE_GCC47_COMPATIBILITY template void AbstractObject::setClean(std::initializer_list*> objects) { + #ifdef __GNUC__ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif return setClean(std::vector*>{objects}); + #ifdef __GNUC__ + #pragma GCC diagnostic pop + #endif } #endif #endif @@ -74,7 +81,14 @@ template auto AbstractObject::tr #ifdef CORRADE_GCC47_COMPATIBILITY template auto AbstractObject::transformationMatrices(std::initializer_list*> objects, const MatrixType& initialTransformationMatrix) const -> std::vector { + #ifdef __GNUC__ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif return transformationMatrices(std::vector*>{objects}, initialTransformationMatrix); + #ifdef __GNUC__ + #pragma GCC diagnostic pop + #endif } #endif #endif @@ -234,7 +248,14 @@ template auto Object::transformationMatric #ifdef CORRADE_GCC47_COMPATIBILITY template auto Object::transformationMatrices(std::initializer_list*> objects, const MatrixType& initialTransformationMatrix) const -> std::vector { + #ifdef __GNUC__ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif return transformationMatrices(std::vector*>{objects}, initialTransformationMatrix); + #ifdef __GNUC__ + #pragma GCC diagnostic pop + #endif } #endif #endif @@ -360,7 +381,14 @@ template std::vector Ob #ifdef CORRADE_GCC47_COMPATIBILITY template std::vector Object::transformations(std::initializer_list*> objects, const typename Transformation::DataType& initialTransformation) const { + #ifdef __GNUC__ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif return transformations(std::vector*>{objects}, initialTransformation); + #ifdef __GNUC__ + #pragma GCC diagnostic pop + #endif } #endif #endif @@ -464,7 +492,14 @@ template void Object::setClean(const std:: #ifdef CORRADE_GCC47_COMPATIBILITY template void Object::setClean(std::initializer_list*> objects) { + #ifdef __GNUC__ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif setClean(std::vector*>{objects}); + #ifdef __GNUC__ + #pragma GCC diagnostic pop + #endif } #endif #endif