From bae5f52c03a1a7a8011eb0b53be69edc4989868d Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Thu, 9 Jan 2014 11:15:44 +0100 Subject: [PATCH] remove template parameter that allows not to store c3t3 info. It is actually always needed to do so --- Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h b/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h index 50d148a36b1..0c524e3161a 100644 --- a/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h +++ b/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h @@ -991,7 +991,6 @@ private: CGAL::cpp11::array vertices_; }; - template class Cell_data_backup { public: @@ -1003,15 +1002,12 @@ private: else sliver_value_ = 0.; - if(store_c3t3_info) + subdomain_index_ = c->subdomain_index(); + for(std::size_t i = 0; i < 4; ++i) { - subdomain_index_ = c->subdomain_index(); - for(std::size_t i = 0; i < 4; ++i) - { - surface_index_table_[i] = c->surface_patch_index(i); - facet_surface_center_[i] = c->get_facet_surface_center(i); - surface_center_index_table_[i] = c->get_facet_surface_center_index(i); - } + surface_index_table_[i] = c->surface_patch_index(i); + facet_surface_center_[i] = c->get_facet_surface_center(i); + surface_center_index_table_[i] = c->get_facet_surface_center_index(i); } //note c->next_intrusive() and c->previous_intrusive() //are lost by 'backup' and 'restore', @@ -1070,9 +1066,6 @@ private: //we don't need to store 'visited' information because it is //reset and used locally where is it needed - if(!store_c3t3_info) - return; - //add_to_complex sets the index, and updates the cell counter if(subdomain_index_ != Subdomain_index()) c3t3.add_to_complex(c, subdomain_index_); @@ -1757,7 +1750,6 @@ update_mesh_no_topo_change(const Point_3& new_position, Point_3 old_position = vertex->point(); //backup metadata - typedef Cell_data_backup Cell_data_backup; std::vector cells_backup; fill_cells_backup(conflict_cells, cells_backup); @@ -1834,7 +1826,6 @@ update_mesh_topo_change(const Point_3& new_position, Point_3 old_position = old_vertex->point(); //backup metadata - typedef Cell_data_backup Cell_data_backup; std::vector cells_backup; fill_cells_backup(conflict_cells, cells_backup);