songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hardcode the use of std::size_t as id_type for PVertex

This commit is contained in:
Jane Tournois 2014-01-03 16:20:59 +01:00 committed by Laurent Rineau
parent 43113876bd
commit 0798f093d4
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
View File

@ -966,19 +966,18 @@ private:
/**
* to be used by the perturber
*/
template<typename VertexIdType>
class Cell_from_ids
: CGAL::cpp11::array<VertexIdType, 4>
: CGAL::cpp11::array<std::size_t, 4>
{
public:
Cell_from_ids(const Cell_handle& c)
: vertices_()
{
for(std::size_t i = 0; i < 4; ++i)
vertices_[i] = static_cast<VertexIdType>(c->vertex(i)->meshing_info());
vertices_[i] = static_cast<std::size_t>(c->vertex(i)->meshing_info());
}
VertexIdType vertex_id(const std::size_t& i) const
std::size_t vertex_id(const std::size_t& i) const
{
CGAL_precondition(i >= 0 && i < 4);
return vertices_[i];
@ -988,15 +987,12 @@ private:
// vertices IDs
// they should be ordered in the same way as they were in the
// cell to be backed-up
CGAL::cpp11::array<VertexIdType, 4> vertices_;
CGAL::cpp11::array<std::size_t, 4> vertices_;
};
template<typename VertexIdType,
bool store_c3t3_info = true>
template<bool store_c3t3_info = true>
class Cell_data_backup
{
typedef Cell_from_ids<VertexIdType> Cell_from_ids;
public:
Cell_data_backup(const Cell_handle& c)
: cell_ids_(c)
@ -1033,8 +1029,8 @@ private:
IndexMap new_to_old_indices;
for(std::size_t i = 0; i < 4; ++i)
{
VertexIdType new_vi_index =
static_cast<VertexIdType>(new_cell->vertex(i)->meshing_info());
std::size_t new_vi_index =
static_cast<std::size_t>(new_cell->vertex(i)->meshing_info());
for(std::size_t j = 0; j < 4; ++j)
{
if(new_vi_index == cell_ids_.vertex_id(j))
@ -1760,7 +1756,7 @@ update_mesh_no_topo_change(const Point_3& new_position,
Point_3 old_position = vertex->point();
//backup metadata
typedef Cell_data_backup<unsigned int/*BAD*/, false> Cell_data_backup;
typedef Cell_data_backup<false/*store c3t3 info*/> Cell_data_backup;
std::vector<Cell_data_backup> cells_backup;
fill_cells_backup(conflict_cells, cells_backup);
@ -1837,7 +1833,7 @@ update_mesh_topo_change(const Point_3& new_position,
Point_3 old_position = old_vertex->point();
//backup metadata
typedef Cell_data_backup<unsigned int/*BAD*/> Cell_data_backup;
typedef Cell_data_backup<true/*store c3t3 info*/> Cell_data_backup;
std::vector<Cell_data_backup> cells_backup;
fill_cells_backup(conflict_cells, cells_backup);

2
Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
View File

@ -108,7 +108,7 @@ private:
class PVertex
{
public:
typedef unsigned int id_type;
typedef std::size_t id_type;
/// Constructor
PVertex()