From c473fa8c61f775da9af77c0da21273dab3771aed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 9 Apr 2014 00:15:42 +0200
Subject: [PATCH] GCC 4.5 compatibility: cannot silence warnings in functions.

---
 src/Magnum/SceneGraph/Object.hpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Magnum/SceneGraph/Object.hpp b/src/Magnum/SceneGraph/Object.hpp
index 92b43ce7f..751c99d2e 100644
--- a/src/Magnum/SceneGraph/Object.hpp
+++ b/src/Magnum/SceneGraph/Object.hpp
@@ -53,13 +53,13 @@ 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__
+    #if defined(__GNUC__) && !defined(CORRADE_GCC45_COMPATIBILITY)
     #pragma GCC diagnostic push
     #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     #endif
     /* GCC 4.5 doesn't like {} here */
     return setClean(std::vector<AbstractObject<dimensions, T>*>(objects));
-    #ifdef __GNUC__
+    #if defined(__GNUC__) && !defined(CORRADE_GCC45_COMPATIBILITY)
     #pragma GCC diagnostic pop
     #endif
 }
@@ -84,13 +84,13 @@ 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__
+    #if defined(__GNUC__) && !defined(CORRADE_GCC45_COMPATIBILITY)
     #pragma GCC diagnostic push
     #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     #endif
     /* GCC 4.5 doesn't like {} here */
     return transformationMatrices(std::vector<AbstractObject<dimensions, T>*>(objects), initialTransformationMatrix);
-    #ifdef __GNUC__
+    #if defined(__GNUC__) && !defined(CORRADE_GCC45_COMPATIBILITY)
     #pragma GCC diagnostic pop
     #endif
 }
@@ -256,13 +256,13 @@ 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__
+    #if defined(__GNUC__) && !defined(CORRADE_GCC45_COMPATIBILITY)
     #pragma GCC diagnostic push
     #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     #endif
     /* GCC 4.5 doesn't like {} here */
     return transformationMatrices(std::vector<Object<Transformation>*>(objects), initialTransformationMatrix);
-    #ifdef __GNUC__
+    #if defined(__GNUC__) && !defined(CORRADE_GCC45_COMPATIBILITY)
     #pragma GCC diagnostic pop
     #endif
 }
@@ -400,13 +400,13 @@ 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__
+    #if defined(__GNUC__) && !defined(CORRADE_GCC45_COMPATIBILITY)
     #pragma GCC diagnostic push
     #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     #endif
     /* GCC 4.5 doesn't like {} here */
     return transformations(std::vector<Object<Transformation>*>(objects), initialTransformation);
-    #ifdef __GNUC__
+    #if defined(__GNUC__) && !defined(CORRADE_GCC45_COMPATIBILITY)
     #pragma GCC diagnostic pop
     #endif
 }
@@ -530,13 +530,13 @@ 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__
+    #if defined(__GNUC__) && !defined(CORRADE_GCC45_COMPATIBILITY)
     #pragma GCC diagnostic push
     #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     #endif
     /* GCC 4.5 doesn't like {} here */
     setClean(std::vector<Object<Transformation>*>(objects));
-    #ifdef __GNUC__
+    #if defined(__GNUC__) && !defined(CORRADE_GCC45_COMPATIBILITY)
     #pragma GCC diagnostic pop
     #endif
 }