Merge pull request #4445 from the-maddin/ignore-gcc11-warning

Ignore Wshadow warnings in stale librocket headers

Author: asarium

code/scpui/IncludeNodeHandler.h

@@ -4,8 +4,17 @@
 #pragma push_macro("Assert")
 #undef Assert
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #include <Rocket/Core/XMLNodeHandler.h>
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 #pragma pop_macro("Assert")
 
 namespace scpui {

code/scpui/SoundPlugin.h

@@ -6,9 +6,18 @@
 #pragma push_macro("Assert")
 #undef Assert
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #include <Rocket/Core.h>
 #include <Rocket/Core/Plugin.h>
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 #pragma pop_macro("Assert")
 
 namespace scpui {

code/scpui/elements/AnimationElement.cpp

@@ -7,12 +7,21 @@
 #pragma push_macro("Assert")
 #undef Assert
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #include <Rocket/Core.h>
 #include <Rocket/Core/ElementDocument.h>
 #include <Rocket/Core/GeometryUtilities.h>
 #include <Rocket/Core/String.h>
 #include <scpui/RocketRenderingInterface.h>
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 #pragma pop_macro("Assert")
 
 namespace scpui {

code/scpui/elements/AnimationElement.h

@@ -4,10 +4,19 @@
 #pragma push_macro("Assert")
 #undef Assert
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #include <Rocket/Core/Element.h>
 #include <Rocket/Core/Geometry.h>
 #include <Rocket/Core/Texture.h>
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 #pragma pop_macro("Assert")
 
 namespace scpui {

code/scpui/elements/ScrollingTextElement.cpp

@@ -10,8 +10,17 @@
 #pragma push_macro("Assert")
 #undef Assert
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #include <Rocket/Core.h>
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 #pragma pop_macro("Assert")
 
 namespace scpui {

code/scpui/elements/ScrollingTextElement.h

@@ -4,10 +4,19 @@
 #pragma push_macro("Assert")
 #undef Assert
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #include <Rocket/Core/Element.h>
 #include <Rocket/Core/Geometry.h>
 #include <Rocket/Core/Texture.h>
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 #pragma pop_macro("Assert")
 
 namespace scpui {