diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-01-12 16:54:37 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-01-12 16:54:37 +0000 |
| commit | d944e35af84a59c9dc88f7027b04c9528cc1bf9b (patch) | |
| tree | 449420f406a63fc0df73fcfd4201e35f98678407 /src/GudhUI | |
| parent | 178f37684b9f3bebf95534568b5ef54c15e11c63 (diff) | |
| parent | 9aa92aa2b504d9530125a6a164f76c11f45d8bb5 (diff) | |
Backmerge of last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@959 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: a5c6ef0ae2ee1e18fff88b98131ff4d14a252152
Diffstat (limited to 'src/GudhUI')
| -rw-r--r-- | src/GudhUI/utils/K_nearest_builder.h | 10 |
1 files changed, 4 insertions, 6 deletions
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); } |