Browse Source

GCC 4.7 compatibility: hide deprecated warnings in internal code.

pull/51/head
Vladimír Vondruš 12 years ago
parent
commit
5ddd9d16f8
  1. 35
      src/Magnum/SceneGraph/Object.hpp

35
src/Magnum/SceneGraph/Object.hpp

@ -52,7 +52,14 @@ template<UnsignedInt dimensions, class T> void AbstractObject<dimensions, T>::se
#ifdef CORRADE_GCC47_COMPATIBILITY
template<UnsignedInt dimensions, class T> void AbstractObject<dimensions, T>::setClean(std::initializer_list<AbstractObject<dimensions, T>*> objects) {
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
return setClean(std::vector<AbstractObject<dimensions, T>*>{objects});
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
}
#endif
#endif
@ -74,7 +81,14 @@ template<UnsignedInt dimensions, class T> auto AbstractObject<dimensions, T>::tr
#ifdef CORRADE_GCC47_COMPATIBILITY
template<UnsignedInt dimensions, class T> auto AbstractObject<dimensions, T>::transformationMatrices(std::initializer_list<AbstractObject<dimensions, T>*> objects, const MatrixType& initialTransformationMatrix) const -> std::vector<MatrixType> {
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
return transformationMatrices(std::vector<AbstractObject<dimensions, T>*>{objects}, initialTransformationMatrix);
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
}
#endif
#endif
@ -234,7 +248,14 @@ template<class Transformation> auto Object<Transformation>::transformationMatric
#ifdef CORRADE_GCC47_COMPATIBILITY
template<class Transformation> auto Object<Transformation>::transformationMatrices(std::initializer_list<Object<Transformation>*> objects, const MatrixType& initialTransformationMatrix) const -> std::vector<MatrixType> {
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
return transformationMatrices(std::vector<Object<Transformation>*>{objects}, initialTransformationMatrix);
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
}
#endif
#endif
@ -360,7 +381,14 @@ template<class Transformation> std::vector<typename Transformation::DataType> Ob
#ifdef CORRADE_GCC47_COMPATIBILITY
template<class Transformation> std::vector<typename Transformation::DataType> Object<Transformation>::transformations(std::initializer_list<Object<Transformation>*> objects, const typename Transformation::DataType& initialTransformation) const {
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
return transformations(std::vector<Object<Transformation>*>{objects}, initialTransformation);
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
}
#endif
#endif
@ -464,7 +492,14 @@ template<class Transformation> void Object<Transformation>::setClean(const std::
#ifdef CORRADE_GCC47_COMPATIBILITY
template<class Transformation> void Object<Transformation>::setClean(std::initializer_list<Object<Transformation>*> objects) {
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
setClean(std::vector<Object<Transformation>*>{objects});
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
}
#endif
#endif

Loading…
Cancel
Save