From f520602a0dcbcefe0a28a346f11fd84b15249f34 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Fri, 19 Jan 2024 10:05:30 +0000 Subject: [PATCH] Comment #warning and qualify get() with std:: --- .../CGAL/Polygon_mesh_processing/autorefinement.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/autorefinement.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/autorefinement.h index 8de91af1da8..c38d783572b 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/autorefinement.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/autorefinement.h @@ -468,10 +468,10 @@ bool collect_intersections(const std::array& t1, } } - #warning TODO get rid of sort and unique calls +// #warning TODO get rid of sort and unique calls // because we don't handle intersection type and can have edge-edge edge-vertex duplicates - std::sort(inter_pts.begin(), inter_pts.end(), [](auto p, auto q){return get<0>(p)(q);}); - auto last = std::unique(inter_pts.begin(), inter_pts.end(), [](auto p, auto q){return get<0>(p)==get<0>(q);}); + std::sort(inter_pts.begin(), inter_pts.end(), [](auto p, auto q){return std::get<0>(p)(q);}); + auto last = std::unique(inter_pts.begin(), inter_pts.end(), [](auto p, auto q){return std::get<0>(p)==std::get<0>(q);}); inter_pts.erase(last, inter_pts.end()); #ifdef CGAL_AUTOREF_DEBUG_DEPTH @@ -493,10 +493,10 @@ struct Triangle_data template std::size_t add_point(const std::tuple& tpl) { - if (get(tpl) < 0) - return -get(tpl)-1; - points.push_back(get<0>(tpl)); - point_locations.push_back(get(tpl)); + if (std::get(tpl) < 0) + return -std::get(tpl)-1; + points.push_back(std::get<0>(tpl)); + point_locations.push_back(std::get(tpl)); return points.size()-1; }