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.

Sign up for GitHub

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

Jump to bottom

Envelope: Replace auto #8041

Merged
merged 2 commits into from
Feb 22, 2024
Merged

Envelope: Replace auto #8041

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
038de7e
Envelope: Replace auto
afabri Feb 20, 2024
6112a36
unsigned int -> std::size_t
afabri Feb 20, 2024
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
12 changes: 6 additions & 6 deletions Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Point_2, unsigned int> Intersect_point_2;
typedef std::pair<Point_2, std::size_t> Intersect_point_2;
std::list<std::variant<X_monotone_curve_2, Intersect_point_2>>
intersections_list;

Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 =
Expand Down