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

Fix warnings

This commit is contained in:
Clement Jamin 2014-04-01 14:40:44 +02:00
parent 53b9729d71
commit 939b8b648f
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Triangulation/benchmark/Triangulation/delaunay.cpp
View File

@ -31,7 +31,7 @@ void test(const int d, const std::string & type, const int N)
std::vector<Point> points; std::vector<Point> points;
CGAL::Random rng; CGAL::Random rng;
Random_points_iterator rand_it(d, 2.0, rng); Random_points_iterator rand_it(d, 2.0, rng);
CGAL::copy_n(rand_it, N, std::back_inserter(points)); CGAL::cpp11::copy_n(rand_it, N, std::back_inserter(points));
cost.reset();cost.start(); cost.reset();cost.start();
std::cout << " Delaunay triangulation of "<<N<<" points in dim "<<d<< std::flush; std::cout << " Delaunay triangulation of "<<N<<" points in dim "<<d<< std::flush;
dt.insert(points.begin(), points.end()); dt.insert(points.begin(), points.end());

5
Triangulation/include/CGAL/Triangulation_data_structure.h
View File

@ -1403,7 +1403,7 @@ Triangulation_data_structure<Dimen, Vb, Fcb>
const int cur_dim = current_dimension(); const int cur_dim = current_dimension();
// write the vertex indices of each full_cell // write the vertex indices of each full_cell
size_t i = 0; int i = 0;
for( Full_cell_const_iterator it = full_cells_begin(); it != full_cells_end(); ++it ) for( Full_cell_const_iterator it = full_cells_begin(); it != full_cells_end(); ++it )
{ {
index_of_full_cell[it] = i++; index_of_full_cell[it] = i++;
@ -1528,10 +1528,9 @@ operator<<(std::ostream & os, const Triangulation_data_structure<Dimen, Vb, Fcb>
if( n == 0 ) if( n == 0 )
return os; return os;
size_t i(0);
// write the vertices // write the vertices
std::map<Vertex_handle, int> index_of_vertex; std::map<Vertex_handle, int> index_of_vertex;
int i = 0;
for( Vertex_iterator it = tr.vertices_begin(); it != tr.vertices_end(); ++it, ++i ) for( Vertex_iterator it = tr.vertices_begin(); it != tr.vertices_end(); ++it, ++i )
{ {
os << *it; // write the vertex os << *it; // write the vertex

2
Triangulation/include/CGAL/Triangulation_ds_full_cell.h
View File

@ -89,7 +89,7 @@ public:
int maximal_dimension() const /* Concept */ int maximal_dimension() const /* Concept */
{ {
return vertices().size() - 1; return static_cast<int>(vertices().size() - 1);
} }
Vertex_handle_const_iterator vertices_begin() const /* Concept */ Vertex_handle_const_iterator vertices_begin() const /* Concept */

2
Triangulation/test/Triangulation/delaunay.cpp
View File

@ -39,7 +39,7 @@ void test(const int d, const string & type, const int N)
vector<Point> points; vector<Point> points;
CGAL::Random rng; CGAL::Random rng;
Random_points_iterator rand_it(d, 2.0, rng); Random_points_iterator rand_it(d, 2.0, rng);
//CGAL::copy_n(rand_it, N, back_inserter(points)); //CGAL::cpp11::copy_n(rand_it, N, back_inserter(points));
vector<int> coords(d); vector<int> coords(d);
for( int i = 0; i < N; ++i ) for( int i = 0; i < N; ++i )

2
Triangulation/test/Triangulation/torture.cpp
View File

@ -128,7 +128,7 @@ int main(int argc, char **argv)
{ {
int N = 5; int N = 5;
int nb_trials = 4; int nb_trials = 4;
int rand_init=time(NULL); unsigned int rand_init = static_cast<unsigned int>(time(NULL));
if( argc > 1 ) if( argc > 1 )
N = atoi(argv[1]); N = atoi(argv[1]);
if( argc > 2 ) if( argc > 2 )

2
Triangulation/test/Triangulation/triangulation.cpp
View File

@ -36,7 +36,7 @@ void test(const int d, const string & type, int N)
vector<Point> points; vector<Point> points;
CGAL::Random rng; CGAL::Random rng;
Random_points_iterator rand_it(d, 1.0, rng); Random_points_iterator rand_it(d, 1.0, rng);
CGAL::copy_n(rand_it, N, std::back_inserter(points)); CGAL::cpp11::copy_n(rand_it, N, std::back_inserter(points));
cerr << '\n' << points.size() << " points in the grid."; cerr << '\n' << points.size() << " points in the grid.";