diff --git a/Triangulation/benchmark/Triangulation/delaunay.cpp b/Triangulation/benchmark/Triangulation/delaunay.cpp index 553d0a831b9..da04986632b 100644 --- a/Triangulation/benchmark/Triangulation/delaunay.cpp +++ b/Triangulation/benchmark/Triangulation/delaunay.cpp @@ -31,7 +31,7 @@ void test(const int d, const std::string & type, const int N) std::vector points; CGAL::Random 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(); std::cout << " Delaunay triangulation of "< const int cur_dim = current_dimension(); // 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 ) { index_of_full_cell[it] = i++; @@ -1528,10 +1528,9 @@ operator<<(std::ostream & os, const Triangulation_data_structure if( n == 0 ) return os; - size_t i(0); // write the vertices std::map index_of_vertex; - + int i = 0; for( Vertex_iterator it = tr.vertices_begin(); it != tr.vertices_end(); ++it, ++i ) { os << *it; // write the vertex diff --git a/Triangulation/include/CGAL/Triangulation_ds_full_cell.h b/Triangulation/include/CGAL/Triangulation_ds_full_cell.h index c18942e631e..e6a07cc71a5 100644 --- a/Triangulation/include/CGAL/Triangulation_ds_full_cell.h +++ b/Triangulation/include/CGAL/Triangulation_ds_full_cell.h @@ -89,7 +89,7 @@ public: int maximal_dimension() const /* Concept */ { - return vertices().size() - 1; + return static_cast(vertices().size() - 1); } Vertex_handle_const_iterator vertices_begin() const /* Concept */ diff --git a/Triangulation/test/Triangulation/delaunay.cpp b/Triangulation/test/Triangulation/delaunay.cpp index 337eadcbba0..419fb47d29b 100644 --- a/Triangulation/test/Triangulation/delaunay.cpp +++ b/Triangulation/test/Triangulation/delaunay.cpp @@ -39,7 +39,7 @@ void test(const int d, const string & type, const int N) vector points; CGAL::Random 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 coords(d); for( int i = 0; i < N; ++i ) diff --git a/Triangulation/test/Triangulation/torture.cpp b/Triangulation/test/Triangulation/torture.cpp index ad3e41888e5..f7162d95dcf 100644 --- a/Triangulation/test/Triangulation/torture.cpp +++ b/Triangulation/test/Triangulation/torture.cpp @@ -128,7 +128,7 @@ int main(int argc, char **argv) { int N = 5; int nb_trials = 4; - int rand_init=time(NULL); + unsigned int rand_init = static_cast(time(NULL)); if( argc > 1 ) N = atoi(argv[1]); if( argc > 2 ) diff --git a/Triangulation/test/Triangulation/triangulation.cpp b/Triangulation/test/Triangulation/triangulation.cpp index 73b6e774fed..063c821fdb5 100644 --- a/Triangulation/test/Triangulation/triangulation.cpp +++ b/Triangulation/test/Triangulation/triangulation.cpp @@ -36,7 +36,7 @@ void test(const int d, const string & type, int N) vector points; CGAL::Random 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.";