Skip to content

Commit b7a9a47

Browse files
authored
Suppress dll-interface warnings (C4251) on windows
Signed-off-by: Ian Chen <ichen@openrobotics.org>
1 parent 3feca61 commit b7a9a47

8 files changed

+88
-0
lines changed

ogre2/include/gz/rendering/ogre2/Ogre2DynamicRenderable.hh

+12
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@
3333
#pragma warning(pop)
3434
#endif
3535

36+
#ifdef _MSC_VER
37+
#pragma warning(push)
38+
// Suppress dll-interface warning. This should no longer be needed in
39+
// gz-rendering9 as visibility changed hidden by default.
40+
#pragma warning(disable:4251)
41+
#endif
42+
3643
namespace Ogre
3744
{
3845
class MovableObject;
@@ -154,4 +161,9 @@ namespace gz
154161
}
155162
}
156163
}
164+
165+
#ifdef _MSC_VER
166+
#pragma warning(pop)
167+
#endif
168+
157169
#endif

ogre2/include/gz/rendering/ogre2/Ogre2GaussianNoisePass.hh

+12
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
#include "gz/rendering/ogre2/Ogre2RenderPass.hh"
2424
#include "gz/rendering/ogre2/Export.hh"
2525

26+
#ifdef _MSC_VER
27+
#pragma warning(push)
28+
// Suppress dll-interface warning. This should no longer be needed in
29+
// gz-rendering9 as visibility changed hidden by default.
30+
#pragma warning(disable:4251)
31+
#endif
32+
2633
namespace gz
2734
{
2835
namespace rendering
@@ -57,4 +64,9 @@ namespace gz
5764
}
5865
}
5966
}
67+
68+
#ifdef _MSC_VER
69+
#pragma warning(pop)
70+
#endif
71+
6072
#endif

ogre2/include/gz/rendering/ogre2/Ogre2GlobalIlluminationCiVct.hh

+12
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@
2424

2525
#include <memory>
2626

27+
#ifdef _MSC_VER
28+
#pragma warning(push)
29+
// Suppress dll-interface warning. This should no longer be needed in
30+
// gz-rendering9 as visibility changed hidden by default.
31+
#pragma warning(disable:4251)
32+
#endif
33+
2734
namespace Ogre
2835
{
2936
class HlmsPbs;
@@ -230,4 +237,9 @@ namespace gz
230237
}
231238
}
232239
}
240+
241+
#ifdef _MSC_VER
242+
#pragma warning(pop)
243+
#endif
244+
233245
#endif

ogre2/include/gz/rendering/ogre2/Ogre2GlobalIlluminationVct.hh

+12
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@
2424

2525
#include <memory>
2626

27+
#ifdef _MSC_VER
28+
#pragma warning(push)
29+
// Suppress dll-interface warning. This should no longer be needed in
30+
// gz-rendering9 as visibility changed hidden by default.
31+
#pragma warning(disable:4251)
32+
#endif
33+
2734
namespace Ogre
2835
{
2936
class HlmsPbs;
@@ -148,4 +155,9 @@ namespace gz
148155
}
149156
}
150157
}
158+
159+
#ifdef _MSC_VER
160+
#pragma warning(pop)
161+
#endif
162+
151163
#endif

ogre2/include/gz/rendering/ogre2/Ogre2LensFlarePass.hh

+12
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@
2727
#include "gz/rendering/ogre2/Export.hh"
2828
#include "gz/rendering/ogre2/Ogre2RenderPass.hh"
2929

30+
#ifdef _MSC_VER
31+
#pragma warning(push)
32+
// Suppress dll-interface warning. This should no longer be needed in
33+
// gz-rendering9 as visibility changed hidden by default.
34+
#pragma warning(disable:4251)
35+
#endif
36+
3037
namespace gz
3138
{
3239
namespace rendering
@@ -101,4 +108,9 @@ namespace gz
101108
}
102109
}
103110
}
111+
112+
#ifdef _MSC_VER
113+
#pragma warning(pop)
114+
#endif
115+
104116
#endif

ogre2/include/gz/rendering/ogre2/Ogre2Object.hh

+12
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@
2222
#include "gz/rendering/ogre2/Ogre2RenderTypes.hh"
2323
#include "gz/rendering/ogre2/Export.hh"
2424

25+
#ifdef _MSC_VER
26+
#pragma warning(push)
27+
// Suppress dll-interface warning. This should no longer be needed in
28+
// gz-rendering9 as visibility changed hidden by default.
29+
#pragma warning(disable:4251)
30+
#endif
31+
2532
namespace gz
2633
{
2734
namespace rendering
@@ -50,4 +57,9 @@ namespace gz
5057
}
5158
}
5259
}
60+
61+
#ifdef _MSC_VER
62+
#pragma warning(pop)
63+
#endif
64+
5365
#endif

ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh

+13
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@
2424
#include "gz/rendering/ogre2/Export.hh"
2525
#include "gz/rendering/ogre2/Ogre2Object.hh"
2626

27+
28+
#ifdef _MSC_VER
29+
#pragma warning(push)
30+
// Suppress dll-interface warning. This should no longer be needed in
31+
// gz-rendering9 as visibility changed to hidden by default.
32+
#pragma warning(disable:4251)
33+
#endif
34+
2735
namespace Ogre
2836
{
2937
class CompositorWorkspace;
@@ -92,4 +100,9 @@ namespace gz
92100
}
93101
}
94102
}
103+
104+
#ifdef _MSC_VER
105+
#pragma warning(pop)
106+
#endif
107+
95108
#endif

ogre2/include/gz/rendering/ogre2/Ogre2RenderTargetMaterial.hh

+3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
#pragma warning(push)
3636
// Silence deriving from Ogre::RenderTargetListener dll-linkage warnings
3737
#pragma warning(disable:4275)
38+
// Suppress dll-interface warning. This should no longer be needed in
39+
// gz-rendering9 as visibility changed hidden by default.
40+
#pragma warning(disable:4251)
3841
#endif
3942

4043
namespace gz

0 commit comments

Comments
 (0)