From 8a248c0da3ea42aa63be3870c36ad92dd866bd62 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Mon, 6 Oct 2025 13:47:12 +0100 Subject: [PATCH 1/2] Do not define _USE_MATH_DEFINES --- .../test/Periodic_2_triangulation_2/include/types.h | 2 -- .../Periodic_2_triangulation_2/test_p2t2_delaunay_remove.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/include/types.h b/Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/include/types.h index 5426a481478..6fb89645bfb 100644 --- a/Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/include/types.h +++ b/Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/include/types.h @@ -4,8 +4,6 @@ #ifndef P2T2_UNIT_TEST_TYPES_H #define P2T2_UNIT_TEST_TYPES_H -#define _USE_MATH_DEFINES -#include #include #include diff --git a/Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/test_p2t2_delaunay_remove.cpp b/Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/test_p2t2_delaunay_remove.cpp index 81728edfc7a..f1a19bd7e26 100644 --- a/Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/test_p2t2_delaunay_remove.cpp +++ b/Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/test_p2t2_delaunay_remove.cpp @@ -30,7 +30,7 @@ int main() vh_midpoint = t.insert(Point(0, 0) + midpoint); for (int i = 0; i < n; ++i) { - t.insert(Point(0.3 * sin(i * 1.0 / n * 2 * M_PI), 0.3 * cos(i * 1.0 / n * 2 * M_PI)) + midpoint); + t.insert(Point(0.3 * sin(i * 1.0 / n * 2 * CGAL_PI), 0.3 * cos(i * 1.0 / n * 2 * CGAL_PI)) + midpoint); } t.remove(vh_midpoint); assert(t.is_valid(true)); From 7816c70770df3e74d7a803e32cab995d05109091 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Mon, 6 Oct 2025 15:18:50 +0100 Subject: [PATCH 2/2] Avoid waring of Intel compiler --- Bounding_volumes/include/CGAL/pierce_rectangles_2.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bounding_volumes/include/CGAL/pierce_rectangles_2.h b/Bounding_volumes/include/CGAL/pierce_rectangles_2.h index f33964389da..d122ae70361 100644 --- a/Bounding_volumes/include/CGAL/pierce_rectangles_2.h +++ b/Bounding_volumes/include/CGAL/pierce_rectangles_2.h @@ -892,8 +892,8 @@ four_cover_points(Staircases< Traits >& d, OutputIterator o, bool& ok) sdistx(*(shf - 1), bottom) <= FT(2) * d.r)))) #else if (sdistx(bottom_i.second, bottom) <= FT(2) * d.r && - ((!d.is_x_greater_y() || - (shl == Citerator(share.end()) || + (!d.is_x_greater_y() || + ((shl == Citerator(share.end()) || sdistx(share.back(), bottom) <= FT(2) * d.r) && (shf == Citerator(share.begin()) || sdistx(*(shf - 1), bottom) <= FT(2) * d.r))))