Skip to content

Commit 9a55d90

Browse files
committed
Ignore Wshadow warnings in stale librocket header
GCC 11 raises a warning due to a parameter "word" shadowing a typedef "word".
1 parent cc2b9fc commit 9a55d90

File tree

6 files changed

+30
-0
lines changed

6 files changed

+30
-0
lines changed

code/scpui/IncludeNodeHandler.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@
44
#pragma push_macro("Assert")
55
#undef Assert
66

7+
#pragma GCC diagnostic push
8+
#pragma GCC diagnostic ignored "-Wshadow"
9+
710
#include <Rocket/Core/XMLNodeHandler.h>
811

12+
#pragma GCC diagnostic pop
13+
914
#pragma pop_macro("Assert")
1015

1116
namespace scpui {

code/scpui/SoundPlugin.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@
66
#pragma push_macro("Assert")
77
#undef Assert
88

9+
#pragma GCC diagnostic push
10+
#pragma GCC diagnostic ignored "-Wshadow"
11+
912
#include <Rocket/Core.h>
1013
#include <Rocket/Core/Plugin.h>
1114

15+
#pragma GCC diagnostic pop
16+
1217
#pragma pop_macro("Assert")
1318

1419
namespace scpui {

code/scpui/elements/AnimationElement.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,17 @@
77
#pragma push_macro("Assert")
88
#undef Assert
99

10+
#pragma GCC diagnostic push
11+
#pragma GCC diagnostic ignored "-Wshadow"
12+
1013
#include <Rocket/Core.h>
1114
#include <Rocket/Core/ElementDocument.h>
1215
#include <Rocket/Core/GeometryUtilities.h>
1316
#include <Rocket/Core/String.h>
1417
#include <scpui/RocketRenderingInterface.h>
1518

19+
#pragma GCC diagnostic pop
20+
1621
#pragma pop_macro("Assert")
1722

1823
namespace scpui {

code/scpui/elements/AnimationElement.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@
44
#pragma push_macro("Assert")
55
#undef Assert
66

7+
#pragma GCC diagnostic push
8+
#pragma GCC diagnostic ignored "-Wshadow"
9+
710
#include <Rocket/Core/Element.h>
811
#include <Rocket/Core/Geometry.h>
912
#include <Rocket/Core/Texture.h>
1013

14+
#pragma GCC diagnostic pop
15+
1116
#pragma pop_macro("Assert")
1217

1318
namespace scpui {

code/scpui/elements/ScrollingTextElement.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,13 @@
1010
#pragma push_macro("Assert")
1111
#undef Assert
1212

13+
#pragma GCC diagnostic push
14+
#pragma GCC diagnostic ignored "-Wshadow"
15+
1316
#include <Rocket/Core.h>
1417

18+
#pragma GCC diagnostic pop
19+
1520
#pragma pop_macro("Assert")
1621

1722
namespace scpui {

code/scpui/elements/ScrollingTextElement.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@
44
#pragma push_macro("Assert")
55
#undef Assert
66

7+
#pragma GCC diagnostic push
8+
#pragma GCC diagnostic ignored "-Wshadow"
9+
710
#include <Rocket/Core/Element.h>
811
#include <Rocket/Core/Geometry.h>
912
#include <Rocket/Core/Texture.h>
1013

14+
#pragma GCC diagnostic pop
15+
1116
#pragma pop_macro("Assert")
1217

1318
namespace scpui {

0 commit comments

Comments
 (0)