From 6dfe06a286f1ccfd56be5b59fd75cd6fff891261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Mon, 23 Aug 2021 11:49:45 +0200 Subject: [PATCH] Fix conversion warnings --- .../internal/Tetrahedron_3_Triangle_3_intersection.h | 10 +++++----- .../test/Intersections_3/intersection_test_helper.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Intersections_3/include/CGAL/Intersections_3/internal/Tetrahedron_3_Triangle_3_intersection.h b/Intersections_3/include/CGAL/Intersections_3/internal/Tetrahedron_3_Triangle_3_intersection.h index 7444307adc7..c3ff9d6e819 100644 --- a/Intersections_3/include/CGAL/Intersections_3/internal/Tetrahedron_3_Triangle_3_intersection.h +++ b/Intersections_3/include/CGAL/Intersections_3/internal/Tetrahedron_3_Triangle_3_intersection.h @@ -439,8 +439,8 @@ intersection(const typename K::Tetrahedron_3& tet, // Doesn't matter whether there is another (non-strictly) inside point: if there is, // it is an extremity of the segment - const std::size_t str_inside_pt_pos = - (std::find(vertex_sides.begin(), vertex_sides.end(), ON_BOUNDED_SIDE) - vertex_sides.begin()); + const int str_inside_pt_pos = + int(std::find(vertex_sides.begin(), vertex_sides.end(), ON_BOUNDED_SIDE) - vertex_sides.begin()); CGAL_assertion(str_inside_pt_pos >= 0 && str_inside_pt_pos < 3); Triangle_3 res_tr = triangle(vertex(tr, str_inside_pt_pos), s.source(), s.target()); @@ -478,8 +478,8 @@ intersection(const typename K::Tetrahedron_3& tet, CGAL_assertion(strictly_inside_points == 0); // Grab the inside point - const std::size_t boundary_pt_pos = - (std::find(vertex_sides.begin(), vertex_sides.end(), ON_BOUNDARY) - vertex_sides.begin()); + const int boundary_pt_pos = + int(std::find(vertex_sides.begin(), vertex_sides.end(), ON_BOUNDARY) - vertex_sides.begin()); CGAL_assertion(boundary_pt_pos >= 0 && boundary_pt_pos < 3); const Point_3& boundary_pt = vertex(tr, boundary_pt_pos); @@ -500,7 +500,7 @@ intersection(const typename K::Tetrahedron_3& tet, // 2 boundary points and 1 segment, have to distinguish between cases // depending on if the extremities of the segment are triangle extremities - std::array boundary_pts; + std::array boundary_pts; std::array is_boundary_point_an_extremity; // Grab the inside points diff --git a/Intersections_3/test/Intersections_3/intersection_test_helper.h b/Intersections_3/test/Intersections_3/intersection_test_helper.h index 9ee7caa8040..e3f8a9e7dcc 100644 --- a/Intersections_3/test/Intersections_3/intersection_test_helper.h +++ b/Intersections_3/test/Intersections_3/intersection_test_helper.h @@ -76,7 +76,7 @@ protected: bool has_exact_p; bool has_exact_c; - double m = 0, M = 100; + int m = 0, M = 100; bool verbose = true;