From 13d5e895ac1c3c4eaa1028aaa8f5835f9e820d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Thu, 27 Apr 2017 00:21:47 +0200 Subject: [PATCH] Deduce Triangulation_3's point type from the TDS Since we have a distinc vertex_base for regular triangulations and that this regular vertex base defines a type Point, it is redundant to get the Point type from the Geom_traits. This also allows to remove the Weighted_point_mapper trick, and pass more easily custom point types. --- Triangulation_3/include/CGAL/Triangulation_3.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Triangulation_3/include/CGAL/Triangulation_3.h b/Triangulation_3/include/CGAL/Triangulation_3.h index 33ae3165316..e031ec31dca 100644 --- a/Triangulation_3/include/CGAL/Triangulation_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_3.h @@ -392,15 +392,17 @@ public: typedef Tds Triangulation_data_structure; typedef GT Geom_traits; - typedef typename GT::Point_3 Point; typedef typename GT::Segment_3 Segment; typedef typename GT::Triangle_3 Triangle; typedef typename GT::Tetrahedron_3 Tetrahedron; + // point types + typedef typename GT::Point_3 Point_3; + typedef typename Tds::Vertex::Point Point; + typedef typename Tds::Concurrency_tag Concurrency_tag; typedef typename Tds::Vertex Vertex; - CGAL_static_assertion((boost::is_same::value)); typedef typename Tds::Cell Cell; typedef typename Tds::Facet Facet; typedef typename Tds::Edge Edge;