From 0039cf45cc80c6ab7adefd93cfcc6b035e960cee Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Fri, 24 Apr 2020 08:02:07 +0200 Subject: [PATCH] fix compilation with some C3t3 types --- .../CGAL/Tetrahedral_remeshing/internal/FMLS.h | 17 +++++++++++------ .../internal/smooth_vertices.h | 5 +++-- .../tetrahedral_adaptive_remeshing_impl.h | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/FMLS.h b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/FMLS.h index da72aeddf5a..37418c04e16 100644 --- a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/FMLS.h +++ b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/FMLS.h @@ -566,9 +566,12 @@ void createMLSSurfaces(Subdomain__FMLS& subdomain_FMLS, if (upsample > 0) { +#ifdef CGAL_TETRAHEDRAL_REMESHING_VERBOSE std::cout << "Up sampling MLS " << upsample << std::endl; - for (typename C3t3::Facet_iterator fit = c3t3.facets_begin(); - fit != c3t3.facets_end(); ++fit) +#endif + for (typename C3t3::Facets_in_complex_iterator + fit = c3t3.facets_in_complex_begin(); + fit != c3t3.facets_in_complex_end(); ++fit) { const Surface_index surf_i = c3t3.surface_patch_index(*fit); if (upsample == 1) @@ -629,8 +632,9 @@ void createMLSSurfaces(Subdomain__FMLS& subdomain_FMLS, { std::unordered_set > edgeMap; - for (typename C3t3::Facet_iterator fit = c3t3.facets_begin(); - fit != c3t3.facets_end(); ++fit) + for (typename C3t3::Facets_in_complex_iterator + fit = c3t3.facets_in_complex_begin(); + fit != c3t3.facets_in_complex_end(); ++fit) { for (int i = 0; i < 2; i++) { @@ -661,8 +665,9 @@ void createMLSSurfaces(Subdomain__FMLS& subdomain_FMLS, if (upsample > 0) { - for (typename C3t3::Facet_iterator fit = c3t3.facets_begin(); - fit != c3t3.facets_end(); ++fit) + for (typename C3t3::Facets_in_complex_iterator + fit = c3t3.facets_in_complex_begin(); + fit != c3t3.facets_in_complex_end(); ++fit) { const Surface_index surf_i = c3t3.surface_patch_index(*fit); 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 3e010ecedb9..8aabb863cc7 100644 --- a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/smooth_vertices.h +++ b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/smooth_vertices.h @@ -368,8 +368,9 @@ private: boost::unordered_map >& vertices_surface_indices) { - for (typename C3t3::Facet_iterator fit = c3t3.facets_begin(); - fit != c3t3.facets_end(); ++fit) + for (typename C3t3::Facets_in_complex_iterator + fit = c3t3.facets_in_complex_begin(); + fit != c3t3.facets_in_complex_end(); ++fit) { const Surface_patch_index& surface_index = c3t3.surface_patch_index(*fit); 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 477cc450937..6e2e0072e8f 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 @@ -469,7 +469,7 @@ private: if(m_c3t3.number_of_facets() == 0) patch = 1; else - patch = m_c3t3.surface_patch_index(*m_c3t3.facets_begin()); + patch = m_c3t3.surface_patch_index(*m_c3t3.facets_in_complex_begin()); } void set_surface_patch_index_to_default(const Subdomain_index& s1,