Skip to content

Commit 903d1fb

Browse files
committed
Workaround virtual inheritance warning
1 parent c7ab180 commit 903d1fb

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

util/noise/fast_noise_2.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,20 @@
33

44
#include "../containers/span.h"
55
#include "../math/interval.h"
6+
7+
#if defined(__GNUC__) && !defined(__clang__)
8+
// FastNoise2 uses virtual inheritance, but Godot 4.5 added a warning to enforce not using it.
9+
// See https://github.com/godotengine/godot/pull/103708
10+
#pragma GCC diagnostic push
11+
#pragma GCC diagnostic ignored "-Wvirtual-inheritance"
12+
#endif
13+
614
#include "FastNoise/FastNoise.h"
15+
16+
#if defined(__GNUC__) && !defined(__clang__)
17+
#pragma GCC diagnostic pop
18+
#endif
19+
720
#include <core/io/resource.h>
821

922
class Image;

0 commit comments

Comments
 (0)