Merge from trunk.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bitmap@1050 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 1a32dd3528c771a78d5749ac2c04503a3d979fe4

2 files changed, 5 insertions, 7 deletions

diff --git a/src/GudhUI/utils/Is_manifold.h b/src/GudhUI/utils/Is_manifold.h
index b6b19ee0..0640ea47 100644
--- a/src/GudhUI/utils/Is_manifold.h
+++ b/src/GudhUI/utils/Is_manifold.h
@@ -69,7 +69,7 @@ template<typename SkBlComplex> class Is_manifold {
  private:
   unsigned local_dimension(Vertex_handle v) {
     unsigned dim = 0;
-    for (const auto& s : input_complex_.simplex_range(v))
+    for (const auto& s : input_complex_.star_simplex_range(v))
       dim = (std::max)(dim, (unsigned) s.dimension());
     return dim;
   }
diff --git a/src/GudhUI/utils/K_nearest_builder.h b/src/GudhUI/utils/K_nearest_builder.h
index cab24b7c..7be0a4f4 100644
--- a/src/GudhUI/utils/K_nearest_builder.h
+++ b/src/GudhUI/utils/K_nearest_builder.h
@@ -29,12 +29,10 @@
 #include <CGAL/Search_traits_d.h>
 #include <CGAL/Search_traits_adapter.h>
 #include <CGAL/property_map.h>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/zip_iterator.hpp>
 
 #include <unordered_map>
-#include <tuple>
 #include <list>
+#include <utility>
 
 #include "utils/UI_utils.h"
 #include "model/Complex_typedefs.h"
@@ -43,9 +41,9 @@ template<typename SkBlComplex> class K_nearest_builder {
  private:
   typedef Geometry_trait Kernel;
   typedef Point Point_d;
-  typedef boost::tuple<Point_d, unsigned> Point_d_with_id;
+  typedef std::pair<Point_d, unsigned> Point_d_with_id;
   typedef CGAL::Search_traits_d<Kernel> Traits_base;
-  typedef CGAL::Search_traits_adapter<Point_d_with_id, CGAL::Nth_of_tuple_property_map<0, Point_d_with_id>,
+  typedef CGAL::Search_traits_adapter<Point_d_with_id, CGAL::First_of_pair_property_map<Point_d_with_id>,
       Traits_base> Traits;
   typedef CGAL::Orthogonal_k_neighbor_search<Traits> Neighbor_search;
   typedef Neighbor_search::Tree Tree;
@@ -81,7 +79,7 @@ template<typename SkBlComplex> class K_nearest_builder {
     for (auto p : complex_.vertex_range()) {
       Neighbor_search search(tree, complex_.point(p), k + 1);
       for (auto it = ++search.begin(); it != search.end(); ++it) {
-        Vertex_handle q(boost::get<1>(it->first));
+        Vertex_handle q(std::get<1>(it->first));
         if (p != q && complex_.contains_vertex(p) && complex_.contains_vertex(q))
           complex_.add_edge(p, q);
       }