From 038de7ee03d34c936f4a298233da9dd644810e66 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 20 Feb 2024 17:08:05 +0000 Subject: [PATCH 1/2] Envelope: Replace auto --- .../CGAL/Envelope_3/Envelope_element_visitor_3.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h b/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h index 07e2d706d14f..84247c5d3fe9 100644 --- a/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h +++ b/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h @@ -932,19 +932,19 @@ class Envelope_element_visitor_3 { void copy_data_to_face_boundary(Face_handle face) { Ccb_halfedge_circulator ccb; - for (auto outer_iter = face->outer_ccbs_begin(); + for (Outer_ccb_iterator outer_iter = face->outer_ccbs_begin(); outer_iter != face->outer_ccbs_end(); ++outer_iter) { ccb = *outer_iter; copy_data_to_face_boundary(face, ccb); } - for (auto inner_iter = face->inner_ccbs_begin(); + for (Inner_ccb_iterator inner_iter = face->inner_ccbs_begin(); inner_iter != face->inner_ccbs_end(); ++inner_iter) { ccb = (*inner_iter); copy_data_to_face_boundary(face, ccb); } - for (auto iso_iter = face->isolated_vertices_begin(); + for (Isolated_vertex_iterator iso_iter = face->isolated_vertices_begin(); iso_iter != face->isolated_vertices_end(); ++iso_iter) { Vertex_handle vh = iso_iter; if (! vh->is_decision_set() && has_equal_aux_data_with_face(vh)) @@ -1157,7 +1157,7 @@ class Envelope_element_visitor_3 { } // check inner boundaries - for (auto hole_iter = face->inner_ccbs_begin(); + for (Inner_ccb_iterator hole_iter = face->inner_ccbs_begin(); hole_iter != face->inner_ccbs_end(); ++hole_iter) { hec = (*hole_iter); hec_begin = hec; @@ -1671,7 +1671,7 @@ class Envelope_element_visitor_3 { } // Copy the isolated vertices inside the given face. - for (auto iv_it = face->isolated_vertices_begin(); + for (Isolated_vertex_iterator iv_it = face->isolated_vertices_begin(); iv_it != face->isolated_vertices_end(); ++iv_it) { Vertex_handle iso_v = iv_it; Vertex_handle copied_iso = From 6112a36847f5c1e29a5666e72187d2238285dbef Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 20 Feb 2024 17:26:37 +0000 Subject: [PATCH 2/2] unsigned int -> std::size_t --- Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h b/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h index 84247c5d3fe9..815b23f6cc25 100644 --- a/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h +++ b/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h @@ -482,7 +482,7 @@ class Envelope_element_visitor_3 { // find the intersection points and overlapping segments with the // original curve and insert them to the list of split points // intersect the x-monotone curve with the edge's curve - typedef std::pair Intersect_point_2; + typedef std::pair Intersect_point_2; std::list> intersections_list;