From 7205e10f89245913a33019643df96520038cf6d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 27 Mar 2024 10:36:55 +0100 Subject: [PATCH] fix compilation errors and warnings --- .../tetrahedral_remeshing_generate_input.h | 6 +++--- .../Tetrahedral_remeshing/Adaptive_remeshing_sizing_field.h | 2 +- .../CGAL/Tetrahedral_remeshing/internal/smooth_vertices.h | 3 +++ .../internal/tetrahedral_adaptive_remeshing_impl.h | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/tetrahedral_remeshing_generate_input.h b/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/tetrahedral_remeshing_generate_input.h index 2ba3e069106..155949b37f5 100644 --- a/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/tetrahedral_remeshing_generate_input.h +++ b/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/tetrahedral_remeshing_generate_input.h @@ -169,7 +169,7 @@ namespace Tetrahedral_remeshing std::size_t i = 0; for (const Point& p : pc) { - vpc[i] = tr.insert(pc[i]); + vpc[i] = tr.insert(p); vpc[i]->set_dimension(0); ++i; } @@ -197,9 +197,9 @@ namespace Tetrahedral_remeshing c->set_subdomain_index(1); // set surface patches - for (auto f : tr.finite_facets()) + for (typename Tr::Facet f : tr.finite_facets()) { - auto& mf = tr.mirror_facet(f); + typename Tr::Facet mf = tr.mirror_facet(f); if(tr.is_infinite(f.first) || tr.is_infinite(mf.first)) { f.first->set_surface_patch_index(f.second, 2); diff --git a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/Adaptive_remeshing_sizing_field.h b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/Adaptive_remeshing_sizing_field.h index 1128e00c719..8f7adfdd6f0 100644 --- a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/Adaptive_remeshing_sizing_field.h +++ b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/Adaptive_remeshing_sizing_field.h @@ -126,7 +126,7 @@ public: * Returns size at point `p` */ template - FT operator()(const Bare_point& p, const int& dim, const Index& i) const + FT operator()(const Bare_point& p, const int& dim, const Index& /* i */) const { const int nb_neighbors = (dim == 3) ? 20 : 6; diff --git a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/smooth_vertices.h b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/smooth_vertices.h index 8eee9f6e155..96a587e2ec0 100644 --- a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/smooth_vertices.h +++ b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/smooth_vertices.h @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -717,6 +718,7 @@ private: const Point_3 smoothed_position = current_pos + move; + CGAL_USE(vertices_normals); #ifdef CGAL_TET_REMESHING_SMOOTHING_WITH_MLS Vector_3 sum_projections = CGAL::NULL_VECTOR; @@ -741,6 +743,7 @@ private: const Point_3 new_pos = m_segments_aabb_tree.closest_point(smoothed_position); + #endif //CGAL_TET_REMESHING_SMOOTHING_WITH_MLS #ifdef CGAL_TETRAHEDRAL_REMESHING_DEBUG diff --git a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_adaptive_remeshing_impl.h b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_adaptive_remeshing_impl.h index 4ad207408c8..f239bd724ad 100644 --- a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_adaptive_remeshing_impl.h +++ b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_adaptive_remeshing_impl.h @@ -511,7 +511,7 @@ private: { for (typename Tr::Facet f : tr().finite_facets()) { - typename Tr::Facet mf = tr().mirror_facet(f); + CGAL_assertion_code(typename Tr::Facet mf = tr().mirror_facet(f)); CGAL_assertion(m_c3t3.is_in_complex(f) == m_c3t3.is_in_complex(mf)); } }