From 8018acbf18c62a6ddef1adb55994f0bb0a90f253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 30 Oct 2018 14:02:16 +0100 Subject: [PATCH] unsigned -> unsigned int --- .../render.cpp | 2 +- .../Optimal_transportation_reconstruction_2.h | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/render.cpp b/Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/render.cpp index ac0893ed1e9..794ac675167 100644 --- a/Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/render.cpp +++ b/Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/render.cpp @@ -335,7 +335,7 @@ void R_s_k_2::draw_relevance(const float line_width, const int nb) MultiIndex mindex; FT min_value = (std::numeric_limits::max)(); FT max_value = -(std::numeric_limits::max)(); - unsigned nb_initial = 0; + unsigned int nb_initial = 0; for (Finite_edges_iterator ei = m_dt.finite_edges_begin(); ei != m_dt.finite_edges_end(); ++ei) { Edge edge = *ei; diff --git a/Optimal_transportation_reconstruction_2/include/CGAL/Optimal_transportation_reconstruction_2.h b/Optimal_transportation_reconstruction_2/include/CGAL/Optimal_transportation_reconstruction_2.h index 091f7e95460..4e487ef93a9 100644 --- a/Optimal_transportation_reconstruction_2/include/CGAL/Optimal_transportation_reconstruction_2.h +++ b/Optimal_transportation_reconstruction_2/include/CGAL/Optimal_transportation_reconstruction_2.h @@ -839,7 +839,7 @@ public: bool random_pedge(Rec_edge_2& pedge) { - for (unsigned i = 0; i < 10; ++i) { + for (unsigned int i = 0; i < 10; ++i) { Edge edge = m_dt.random_finite_edge(); if (m_dt.is_pinned(edge)) continue; @@ -992,7 +992,7 @@ public: Face_handle copy_face( Face_handle f0, Face_handle f1, Vertex_handle_map& vmap) const { - for (unsigned i = 0; i < 3; ++i) { + for (unsigned int i = 0; i < 3; ++i) { Vertex_handle v0i = f0->vertex(i); Vertex_handle v1i = vmap[v0i]; f1->set_vertex(i, v1i); @@ -1014,7 +1014,7 @@ public: cf->set_neighbor(i, cfi); } - for (unsigned j = 0; j < 2; ++j) { + for (unsigned int j = 0; j < 2; ++j) { i = (i + 1) % 3; Face_handle fi = f->neighbor(i); Face_handle cfi = fmap[fi]; @@ -1049,8 +1049,8 @@ public: outer_faces.push_back(outer); } - for (unsigned i = 0; i < outer_faces.size(); ++i) { - unsigned j = (i + 1) % outer_faces.size(); + for (unsigned int i = 0; i < outer_faces.size(); ++i) { + unsigned int j = (i + 1) % outer_faces.size(); outer_faces[i]->set_neighbor(2, outer_faces[j]); outer_faces[j]->set_neighbor(1, outer_faces[i]); } @@ -1534,15 +1534,15 @@ public: `false` if the algorithm was prematurely ended because no more edge collapse was possible. */ - bool run(const unsigned steps) { + bool run(const unsigned int steps) { m_tolerance = (FT)(-1.); CGAL::Real_timer timer; if (m_verbose > 0) std::cerr << "reconstruct " << steps; timer.start(); - unsigned performed = 0; - for (unsigned i = 0; i < steps; ++i) { + unsigned int performed = 0; + for (unsigned int i = 0; i < steps; ++i) { bool ok = decimate(); if (!ok) break; @@ -1579,7 +1579,7 @@ public: std::cerr << "reconstruct under tolerance " << tolerance; timer.start(); - unsigned performed = 0; + unsigned int performed = 0; while (decimate ()) performed++;