From 8ddf98ff93bc0643f173bb0b2fc891a3a17d7ec2 Mon Sep 17 00:00:00 2001
From: Lingjie Zhu <lingjie.zhu@nlpr.ia.ac.cn>
Date: Tue, 31 Oct 2017 16:29:43 +0800
Subject: [PATCH] change indexed triangle type to unsigned

---
 .../Surface_mesh_approximation/vsa_example.cpp |  2 +-
 .../include/CGAL/VSA_approximation.h           | 18 +++++++++---------
 .../vsa_class_interface_test.cpp               |  2 +-
 .../vsa_free_function_test.cpp                 |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_example.cpp b/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_example.cpp
index bd099ea4d46..b2abf3c89d2 100644
--- a/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_example.cpp
+++ b/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_example.cpp
@@ -22,7 +22,7 @@ int main()
 
   // output data
   Polyhedron output;
-  std::vector<int> triangles;
+  std::vector<std::size_t> triangles;
   std::vector<Kernel::Point_3> anchors;
 
   // free function interface with named parameters, seperated with dots
diff --git a/Surface_mesh_approximation/include/CGAL/VSA_approximation.h b/Surface_mesh_approximation/include/CGAL/VSA_approximation.h
index 0040fe2289b..6c6c4be24ab 100644
--- a/Surface_mesh_approximation/include/CGAL/VSA_approximation.h
+++ b/Surface_mesh_approximation/include/CGAL/VSA_approximation.h
@@ -175,12 +175,12 @@ private:
   // Triangle polyhedron builder.
   template <typename HDS>
   class TrianglePolyhedronBuilder : public CGAL::Modifier_base<HDS> {
-  public:
     const std::vector<Point_3> &vtxs;
-    const std::vector<int> &tris;
+    const std::vector<std::size_t> &tris;
+  public:
     bool is_manifold;
     TrianglePolyhedronBuilder(const std::vector<Point_3> &_vtxs,
-      const std::vector<int> &_tris)
+      const std::vector<std::size_t> &_tris)
       : vtxs(_vtxs), tris(_tris), is_manifold(true) {}
 
     void operator()(HDS &hds) {
@@ -190,7 +190,7 @@ private:
       builder.begin_surface(vtxs.size(), tris.size() / 3);
       BOOST_FOREACH(const Point_3 &v, vtxs)
         builder.add_vertex(Point(v));
-      for (std::vector<int>::const_iterator itr = tris.begin(); itr != tris.end(); itr += 3) {
+      for (std::vector<std::size_t>::const_iterator itr = tris.begin(); itr != tris.end(); itr += 3) {
         if (builder.test_facet(itr, itr + 3)) {
           builder.begin_facet();
           builder.add_vertex_to_facet(*itr);
@@ -240,7 +240,7 @@ private:
   // All borders cycles.
   std::vector<Border> borders;
   // The indexed triangle approximation.
-  std::vector<int> tris;
+  std::vector<std::size_t> tris;
 
 //member functions
 public:
@@ -884,7 +884,7 @@ public:
    */
   template <typename OutputIterator>
   void get_indexed_triangles(OutputIterator out_itr) const {
-    BOOST_FOREACH(const int &i, tris)
+    BOOST_FOREACH(const std::size_t &i, tris)
       *out_itr++ = i;
   }
 
@@ -1489,9 +1489,9 @@ private:
       int j = global_vtag_map[to_sgv_map[target(he, *m_pmesh)]];
       int k = global_vtag_map[to_sgv_map[target(next(he, *m_pmesh), *m_pmesh)]];
       if (i != j && i != k && j != k) {
-        tris.push_back(i);
-        tris.push_back(j);
-        tris.push_back(k);
+        tris.push_back(static_cast<std::size_t>(i));
+        tris.push_back(static_cast<std::size_t>(j));
+        tris.push_back(static_cast<std::size_t>(k));
       }
     }
   }
diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_class_interface_test.cpp b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_class_interface_test.cpp
index 8f8bdc291d6..9fa5d859f46 100644
--- a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_class_interface_test.cpp
+++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_class_interface_test.cpp
@@ -112,7 +112,7 @@ int main()
   std::vector<Polyhedron::Vertex_handle> anchor_vtx;
   l2_approx.get_anchor_vertices(std::back_inserter(anchor_vtx));
 
-  std::vector<int> tris;
+  std::vector<std::size_t> tris;
   l2_approx.get_indexed_triangles(std::back_inserter(tris));
 
   std::vector<std::vector<std::size_t> > boundary;
diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_free_function_test.cpp b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_free_function_test.cpp
index 0faf12fe6b0..95bb5d6988b 100644
--- a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_free_function_test.cpp
+++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_free_function_test.cpp
@@ -23,7 +23,7 @@ int main()
   }
 
   Polyhedron out_mesh;
-  std::vector<int> tris;
+  std::vector<std::size_t> tris;
   std::vector<Kernel::Point_3> anchor_pos;
   std::list<Polyhedron::Vertex_handle> anchor_vtx;
   std::vector<CGAL::PlaneProxy<Kernel> > proxies;