Skip to content

Commit 6e612cd

Browse files
committed
msvc compat
1 parent 9a55d90 commit 6e612cd

File tree

6 files changed

+24
-0
lines changed

6 files changed

+24
-0
lines changed

code/scpui/IncludeNodeHandler.h

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

7+
#ifdef __GNUC__
78
#pragma GCC diagnostic push
89
#pragma GCC diagnostic ignored "-Wshadow"
10+
#endif
911

1012
#include <Rocket/Core/XMLNodeHandler.h>
1113

14+
#ifdef __GNUC__
1215
#pragma GCC diagnostic pop
16+
#endif
1317

1418
#pragma pop_macro("Assert")
1519

code/scpui/SoundPlugin.h

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

9+
#ifdef __GNUC__
910
#pragma GCC diagnostic push
1011
#pragma GCC diagnostic ignored "-Wshadow"
12+
#endif
1113

1214
#include <Rocket/Core.h>
1315
#include <Rocket/Core/Plugin.h>
1416

17+
#ifdef __GNUC__
1518
#pragma GCC diagnostic pop
19+
#endif
1620

1721
#pragma pop_macro("Assert")
1822

code/scpui/elements/AnimationElement.cpp

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

10+
#ifdef __GNUC__
1011
#pragma GCC diagnostic push
1112
#pragma GCC diagnostic ignored "-Wshadow"
13+
#endif
1214

1315
#include <Rocket/Core.h>
1416
#include <Rocket/Core/ElementDocument.h>
1517
#include <Rocket/Core/GeometryUtilities.h>
1618
#include <Rocket/Core/String.h>
1719
#include <scpui/RocketRenderingInterface.h>
1820

21+
#ifdef __GNUC__
1922
#pragma GCC diagnostic pop
23+
#endif
2024

2125
#pragma pop_macro("Assert")
2226

code/scpui/elements/AnimationElement.h

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

7+
#ifdef __GNUC__
78
#pragma GCC diagnostic push
89
#pragma GCC diagnostic ignored "-Wshadow"
10+
#endif
911

1012
#include <Rocket/Core/Element.h>
1113
#include <Rocket/Core/Geometry.h>
1214
#include <Rocket/Core/Texture.h>
1315

16+
#ifdef __GNUC__
1417
#pragma GCC diagnostic pop
18+
#endif
1519

1620
#pragma pop_macro("Assert")
1721

code/scpui/elements/ScrollingTextElement.cpp

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

13+
#ifdef __GNUC__
1314
#pragma GCC diagnostic push
1415
#pragma GCC diagnostic ignored "-Wshadow"
16+
#endif
1517

1618
#include <Rocket/Core.h>
1719

20+
#ifdef __GNUC__
1821
#pragma GCC diagnostic pop
22+
#endif
1923

2024
#pragma pop_macro("Assert")
2125

code/scpui/elements/ScrollingTextElement.h

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

7+
#ifdef __GNUC__
78
#pragma GCC diagnostic push
89
#pragma GCC diagnostic ignored "-Wshadow"
10+
#endif
911

1012
#include <Rocket/Core/Element.h>
1113
#include <Rocket/Core/Geometry.h>
1214
#include <Rocket/Core/Texture.h>
1315

16+
#ifdef __GNUC__
1417
#pragma GCC diagnostic pop
18+
#endif
1519

1620
#pragma pop_macro("Assert")
1721

0 commit comments

Comments
 (0)