godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91208 from akien-mga/gcc-14-Wtemplate-id-cdtor-warning 

Fix GCC 14 `-Wtemplate-id-cdtor` warnings
This commit is contained in:
Rémi Verschelde 2024-04-29 10:10:06 +02:00
parent 8211b0d143 a8ff47b6d6
commit 2bf4509353
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/templates/ring_buffer.h
View File

@ -211,10 +211,10 @@ public:
size_mask = mask;
}
RingBuffer<T>(int p_power = 0) {
RingBuffer(int p_power = 0) {
resize(p_power);
}
~RingBuffer<T>() {}
~RingBuffer() {}
};
#endif // RING_BUFFER_H

2
core/templates/safe_refcount.h
View File

@ -146,7 +146,7 @@ public:
}
}
_ALWAYS_INLINE_ explicit SafeNumeric<T>(T p_value = static_cast<T>(0)) {
_ALWAYS_INLINE_ explicit SafeNumeric(T p_value = static_cast<T>(0)) {
set(p_value);
}
};

4
thirdparty/clipper2/include/clipper2/clipper.core.h vendored
View File

@ -138,7 +138,7 @@ namespace Clipper2Lib
}
template <typename T2>
explicit Point<T>(const Point<T2>& p)
explicit Point(const Point<T2>& p)
{
Init(p.x, p.y, p.z);
}
@ -180,7 +180,7 @@ namespace Clipper2Lib
Point(const T2 x_, const T2 y_) { Init(x_, y_); }
template <typename T2>
explicit Point<T>(const Point<T2>& p) { Init(p.x, p.y); }
explicit Point(const Point<T2>& p) { Init(p.x, p.y); }
Point operator * (const double scale) const
{

22
thirdparty/clipper2/patches/gcc14-warning.patch vendored Normal file
View File

@ -0,0 +1,22 @@
diff --git a/thirdparty/clipper2/include/clipper2/clipper.core.h b/thirdparty/clipper2/include/clipper2/clipper.core.h
index a77cdad5f4..0de7c3720e 100644
--- a/thirdparty/clipper2/include/clipper2/clipper.core.h
+++ b/thirdparty/clipper2/include/clipper2/clipper.core.h
@@ -138,7 +138,7 @@ namespace Clipper2Lib
}
template <typename T2>
- explicit Point<T>(const Point<T2>& p)
+ explicit Point(const Point<T2>& p)
{
Init(p.x, p.y, p.z);
}
@@ -180,7 +180,7 @@ namespace Clipper2Lib
Point(const T2 x_, const T2 y_) { Init(x_, y_); }
template <typename T2>
- explicit Point<T>(const Point<T2>& p) { Init(p.x, p.y); }
+ explicit Point(const Point<T2>& p) { Init(p.x, p.y); }
Point operator * (const double scale) const
{