From 6ac74caffb12c77ecc9ac3147166bb3367f7913e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 7 Jan 2022 09:26:10 +0100 Subject: [PATCH] fix warnings --- .../AABB_traversal_traits_with_Hausdorff_distance.h | 6 +++--- Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher.h | 1 + .../CGAL/Surface_mesher/Surface_mesher_edges_level.h | 3 --- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/AABB_traversal_traits_with_Hausdorff_distance.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/AABB_traversal_traits_with_Hausdorff_distance.h index b08f8269fca..3d3abe8e48b 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/AABB_traversal_traits_with_Hausdorff_distance.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/AABB_traversal_traits_with_Hausdorff_distance.h @@ -431,9 +431,9 @@ namespace CGAL { // Compute its center. const Point_3 center = Point_3( - (bbox.min(0) + bbox.max(0)) / FT(2), - (bbox.min(1) + bbox.max(1)) / FT(2), - (bbox.min(2) + bbox.max(2)) / FT(2)); + (bbox.xmin() + bbox.xmax()) / FT(2), + (bbox.ymin() + bbox.ymax()) / FT(2), + (bbox.zmin() + bbox.zmax()) / FT(2)); // Find the point from TM2 closest to the center. const Point_3 closest = m_tm2_tree.closest_point(center); diff --git a/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher.h b/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher.h index ee59d6e91f6..6fb99498a23 100644 --- a/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher.h +++ b/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher.h @@ -298,6 +298,7 @@ namespace CGAL { for(bool exit = false; ; exit = true) { + CGAL_USE(exit); // this for loop is a trick to pass in the following "if" once // with center="surface center", and once with // center="circumcenter" diff --git a/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h b/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h index 48721460e28..6466a188db9 100644 --- a/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h +++ b/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h @@ -591,7 +591,6 @@ namespace Surface_mesher { const Point_3&, const Zone& zone) { - CGAL_assertion_code(bool is_e_removed = false); CGAL_assertion_code(const Cell_handle& c = e.first); CGAL_assertion_code(Vertex_handle va = c->vertex(e.second)); CGAL_assertion_code(Vertex_handle vb = c->vertex(e.third)); @@ -614,7 +613,6 @@ namespace Surface_mesher { CGAL_assertion_code(Vertex_handle eit_va = eit->first->vertex(eit->second)); CGAL_assertion_code(Vertex_handle eit_vb = eit->first->vertex(eit->third)); CGAL_assertion_code(order_pair(eit_va, eit_vb)); - CGAL_assertion_code(if(va == eit_va && vb == eit_vb) is_e_removed = true); // c2t3.remove_from_complex(*eit); this->remove_element(make_pair_of_vertices(*eit)); #ifdef CGAL_SURFACE_MESHER_EDGES_DEBUG_INSERTIONS @@ -626,7 +624,6 @@ namespace Surface_mesher { boost::format(" before insertion: remove %1% edges\n") % number_of_edges_removed; #endif -// CGAL_assertion(is_e_removed == true); } // for visitors