From 4e6fe0c561d708bb5047339ed4866baee1ddeebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 6 Jul 2023 18:03:25 +0200 Subject: [PATCH 1/3] fix unused variable warnings --- .../internal/Triangulation_segment_traverser_3_impl.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Triangulation_3/include/CGAL/Triangulation_3/internal/Triangulation_segment_traverser_3_impl.h b/Triangulation_3/include/CGAL/Triangulation_3/internal/Triangulation_segment_traverser_3_impl.h index c14831fe5eb..e436ac74ae7 100644 --- a/Triangulation_3/include/CGAL/Triangulation_3/internal/Triangulation_segment_traverser_3_impl.h +++ b/Triangulation_3/include/CGAL/Triangulation_3/internal/Triangulation_segment_traverser_3_impl.h @@ -13,6 +13,7 @@ #define CGAL_TRIANGULATION_SEGMENT_TRAVERSER_3_IMPL_H #include +#include namespace CGAL { @@ -337,7 +338,9 @@ Triangulation_segment_cell_iterator_3::walk_to_next_3(const Simplex& pre std::array vert = {&(cur_cell->vertex(0)->point()), &(cur_cell->vertex(1)->point()), &(cur_cell->vertex(2)->point()), &(cur_cell->vertex(3)->point())}; - int inside = 0, outside = 0, regular_case = 0, degenerate = 0; + CGAL_assertion_code(int inside = 0;) + CGAL_assertion_code(int outside = 0;) + int regular_case = 0, degenerate = 0; if(cur.lt == Tr::FACET && prev.cell != Cell_handle()) { // [source, target] entered the cell `cur` via a facet. @@ -347,7 +350,7 @@ Triangulation_segment_cell_iterator_3::walk_to_next_3(const Simplex& pre Simplex cur_after_walk; auto case_target_is_inside_cur_cell = [&](int case_nb) { - inside = case_nb; + CGAL_assertion_code(inside = case_nb;) prev_after_walk = {cur_cell, Tr::CELL, -1, -1}; cur_after_walk = {{}, Tr::CELL, -1, -1}; }; @@ -355,7 +358,7 @@ Triangulation_segment_cell_iterator_3::walk_to_next_3(const Simplex& pre if(nnext == Cell_handle{}) { nnext = cur_cell->neighbor(facet_nb); } - outside = facet_nb; + CGAL_assertion_code(outside = facet_nb;) prev_after_walk = {cur_cell, Tr::FACET, facet_nb, -1}; cur_after_walk = {nnext, Tr::FACET, nnext->index(cur_cell), -1}; }; From 560186b4323e035496f68af15fba8f167132d951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 10 Jul 2023 13:25:38 +0200 Subject: [PATCH 2/3] fix one more warning --- .../internal/Triangulation_segment_traverser_3_impl.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Triangulation_3/include/CGAL/Triangulation_3/internal/Triangulation_segment_traverser_3_impl.h b/Triangulation_3/include/CGAL/Triangulation_3/internal/Triangulation_segment_traverser_3_impl.h index e436ac74ae7..fd93f79492d 100644 --- a/Triangulation_3/include/CGAL/Triangulation_3/internal/Triangulation_segment_traverser_3_impl.h +++ b/Triangulation_3/include/CGAL/Triangulation_3/internal/Triangulation_segment_traverser_3_impl.h @@ -350,6 +350,7 @@ Triangulation_segment_cell_iterator_3::walk_to_next_3(const Simplex& pre Simplex cur_after_walk; auto case_target_is_inside_cur_cell = [&](int case_nb) { + CGAL_USE(case_nb); CGAL_assertion_code(inside = case_nb;) prev_after_walk = {cur_cell, Tr::CELL, -1, -1}; cur_after_walk = {{}, Tr::CELL, -1, -1}; From 57b7edb6a3e6d02e74c978bb58414374c9cfac10 Mon Sep 17 00:00:00 2001 From: Sebastien Loriot Date: Wed, 12 Jul 2023 10:41:44 +0200 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Mael --- .../internal/Triangulation_segment_traverser_3_impl.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Triangulation_3/include/CGAL/Triangulation_3/internal/Triangulation_segment_traverser_3_impl.h b/Triangulation_3/include/CGAL/Triangulation_3/internal/Triangulation_segment_traverser_3_impl.h index fd93f79492d..ca9a4f73f8b 100644 --- a/Triangulation_3/include/CGAL/Triangulation_3/internal/Triangulation_segment_traverser_3_impl.h +++ b/Triangulation_3/include/CGAL/Triangulation_3/internal/Triangulation_segment_traverser_3_impl.h @@ -13,6 +13,7 @@ #define CGAL_TRIANGULATION_SEGMENT_TRAVERSER_3_IMPL_H #include + #include namespace CGAL {