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

int -> size_type/std::size_t

This commit is contained in:
Andreas Fabri 2010-06-21 20:31:19 +00:00
parent 0b4c4cf211
commit b456cdb994
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Triangulation_3/include/CGAL/Delaunay_triangulation_3.h
View File

@ -90,6 +90,7 @@ public:
typedef typename Tr_Base::All_cells_iterator All_cells_iterator; typedef typename Tr_Base::All_cells_iterator All_cells_iterator;
typedef typename Tr_Base::size_type size_type;
typedef typename Tr_Base::Locate_type Locate_type; typedef typename Tr_Base::Locate_type Locate_type;
@ -206,7 +207,6 @@ public:
insert(InputIterator first, InputIterator last) insert(InputIterator first, InputIterator last)
{ {
size_type n = number_of_vertices(); size_type n = number_of_vertices();
std::vector<Point> points (first, last); std::vector<Point> points (first, last);
spatial_sort (points.begin(), points.end(), geom_traits()); spatial_sort (points.begin(), points.end(), geom_traits());

1
Triangulation_3/include/CGAL/Regular_triangulation_3.h
View File

@ -65,6 +65,7 @@ public:
typedef typename Tr_Base::Facet Facet; typedef typename Tr_Base::Facet Facet;
typedef typename Tr_Base::Edge Edge; typedef typename Tr_Base::Edge Edge;
typedef typename Tr_Base::size_type size_type;
typedef typename Tr_Base::Locate_type Locate_type; typedef typename Tr_Base::Locate_type Locate_type;
typedef typename Tr_Base::Cell_iterator Cell_iterator; typedef typename Tr_Base::Cell_iterator Cell_iterator;
typedef typename Tr_Base::Facet_iterator Facet_iterator; typedef typename Tr_Base::Facet_iterator Facet_iterator;

2
Triangulation_3/include/CGAL/Triangulation_3.h
View File

@ -1396,7 +1396,7 @@ operator<< (std::ostream& os, const Triangulation_3<GT, Tds> &tr)
CGAL_triangulation_assertion( i == n+1 ); CGAL_triangulation_assertion( i == n+1 );
CGAL_triangulation_assertion( tr.is_infinite(TV[0]) ); CGAL_triangulation_assertion( tr.is_infinite(TV[0]) );
std::map<Vertex_handle, int > V; std::map<Vertex_handle, std::size_t > V;
V[tr.infinite_vertex()] = 0; V[tr.infinite_vertex()] = 0;
for (i=1; i <= n; i++) { for (i=1; i <= n; i++) {

4
Triangulation_3/include/CGAL/Triangulation_data_structure_3.h
View File

@ -316,7 +316,7 @@ public:
int & m, std::map< int, Cell_handle > &C ); int & m, std::map< int, Cell_handle > &C );
// not documented // not documented
void print_cells(std::ostream& os, void print_cells(std::ostream& os,
const std::map<Vertex_handle, int> &V ) const; const std::map<Vertex_handle, std::size_t> &V ) const;
// ACCESS FUNCTIONS // ACCESS FUNCTIONS
@ -1864,7 +1864,7 @@ read_cells(std::istream& is, std::map< int, Vertex_handle > &V,
template < class Vb, class Cb> template < class Vb, class Cb>
void void
Triangulation_data_structure_3<Vb,Cb>:: Triangulation_data_structure_3<Vb,Cb>::
print_cells(std::ostream& os, const std::map<Vertex_handle, int> &V ) const print_cells(std::ostream& os, const std::map<Vertex_handle, std::size_t> &V ) const
{ {
std::map<Cell_handle, int > C; std::map<Cell_handle, int > C;
int i = 0; int i = 0;