diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-29 10:10:06 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-29 10:10:06 +0200 |
| commit | 2bf45093532c2a62669e571977496af6fc2de2a9 (patch) | |
| tree | f6ca28a945858d33a3aadcd9df556d5a8af33fc8 /thirdparty | |
| parent | 8211b0d14338cf67b7cee95ec544001c0adb3823 (diff) | |
| parent | a8ff47b6d6b5070b8247dfed85135b71a4a07cdf (diff) | |
| download | redot-engine-2bf45093532c2a62669e571977496af6fc2de2a9.tar.gz | |
Merge pull request #91208 from akien-mga/gcc-14-Wtemplate-id-cdtor-warning
Fix GCC 14 `-Wtemplate-id-cdtor` warnings
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/clipper2/include/clipper2/clipper.core.h | 4 | ||||
| -rw-r--r-- | thirdparty/clipper2/patches/gcc14-warning.patch | 22 |
2 files changed, 24 insertions, 2 deletions
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 { diff --git a/thirdparty/clipper2/patches/gcc14-warning.patch b/thirdparty/clipper2/patches/gcc14-warning.patch new file mode 100644 index 0000000000..a4f06ef37e --- /dev/null +++ b/thirdparty/clipper2/patches/gcc14-warning.patch @@ -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 + { |