diff --git a/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp b/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp index 43cdae29906..d57f7dcc916 100644 --- a/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp +++ b/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include @@ -55,7 +55,7 @@ std::size_t intersect(ForwardIterator b, ForwardIterator e, const Tree& tree, lo } template -boost::tuple test(const char* name) { +std::tuple test(const char* name) { typedef typename K::FT FT; typedef typename K::Ray_3 Ray; typedef typename K::Line_3 Line; @@ -119,7 +119,7 @@ boost::tuple test(const char* name) segments.erase(std::remove_if(segments.begin(), segments.end(), p), segments.end()); - boost::tuple tu; + std::tuple tu; { CGAL::Timer t; @@ -128,12 +128,12 @@ boost::tuple test(const char* name) for(int i = 0; i < runs; ++i) { long counter = 0L; - tu = boost::make_tuple(intersect(lines.begin(), lines.end(), tree, counter), + tu = std::make_tuple(intersect(lines.begin(), lines.end(), tree, counter), intersect(rays.begin(), rays.end(), tree, counter), intersect(segments.begin(), segments.end(), tree, counter), // cant use counter here 0); - boost::get<3>(tu) = counter; + std::get<3>(tu) = counter; } std::cout << t.time(); } @@ -146,41 +146,41 @@ int main() const char* filename = "data/finger.off"; std::cout << "| Simple cartesian float kernel | "; - boost::tuple t1 = test >(filename); + std::tuple t1 = test >(filename); std::cout << " | " << std::endl; std::cout << "| Cartesian float kernel | "; - boost::tuple t2 = test >(filename); + std::tuple t2 = test >(filename); std::cout << " | " << std::endl; std::cout << "| Simple cartesian double kernel |"; - boost::tuple t3 = test >(filename); + std::tuple t3 = test >(filename); std::cout << " | " << std::endl; std::cout << "| Cartesian double kernel |"; - boost::tuple t4 = test >(filename); + std::tuple t4 = test >(filename); std::cout << " | " << std::endl; std::cout << "| Epic kernel |"; - boost::tuple t5 = test(filename); + std::tuple t5 = test(filename); std::cout << " | " << std::endl; std::size_t a, b, c; long d; - boost::tie(a, b, c, d) = t5; + std::tie(a, b, c, d) = t5; std::cout << a << " " << b << " " << c << " " << d << std::endl; - boost::tie(a, b, c, d) = t4; + std::tie(a, b, c, d) = t4; std::cout << a << " " << b << " " << c << " " << d << std::endl; - boost::tie(a, b, c, d) = t3; + std::tie(a, b, c, d) = t3; std::cout << a << " " << b << " " << c << " " << d << std::endl; - boost::tie(a, b, c, d) = t2; + std::tie(a, b, c, d) = t2; std::cout << a << " " << b << " " << c << " " << d << std::endl; - boost::tie(a, b, c, d) = t1; + std::tie(a, b, c, d) = t1; std::cout << a << " " << b << " " << c << " " << d << std::endl; return 0; } diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/internal/Edge_collapse.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/internal/Edge_collapse.h index 59130d662dc..d6565d40748 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/internal/Edge_collapse.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/internal/Edge_collapse.h @@ -12,7 +12,7 @@ #define CGAL_SURFACE_MESH_SIMPLIFICATION_DETAIL_EDGE_COLLAPSE_H #include - +#include #include #include @@ -265,12 +265,12 @@ private: typename boost::property_traits::reference get_point(const vertex_descriptor v) const { return get(m_vpm, v); } - boost::tuple get_vertices(const halfedge_descriptor h) const + std::tuple get_vertices(const halfedge_descriptor h) const { vertex_descriptor p, q; p = source(h, m_tm); q = target(h, m_tm); - return boost::make_tuple(p, q); + return std::make_tuple(p, q); } std::string vertex_to_string(const vertex_descriptor v) const @@ -282,7 +282,7 @@ private: std::string edge_to_string(const halfedge_descriptor h) const { vertex_descriptor p, q; - boost::tie(p,q) = get_vertices(h); + std::tie(p,q) = get_vertices(h); return boost::str(boost::format("{E%1% %2%->%3%}%4%") % get_edge_id(h) % vertex_to_string(p) % vertex_to_string(q) % (is_border(h, m_tm) ? " (BORDER)" : (is_border(opposite(h, m_tm), m_tm) ? " (~BORDER)": ""))); }