Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix GCC 14 -Wtemplate-id-cdtor warnings #91208

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/templates/ring_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,10 @@ class RingBuffer {
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 changes: 1 addition & 1 deletion core/templates/safe_refcount.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class SafeNumeric {
}
}

_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);
}
};
Expand Down
4 changes: 2 additions & 2 deletions thirdparty/clipper2/include/clipper2/clipper.core.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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
{
Expand Down
22 changes: 22 additions & 0 deletions thirdparty/clipper2/patches/gcc14-warning.patch
Original file line number Diff line number Diff line change
@@ -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
{
Loading