From 75a9c1fbc2e8f72f6a09eb3e98fe37dffb47ca85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 4 Apr 2017 17:49:47 +0200 Subject: [PATCH] Consistently grab the Bare_point typedef from the triangulation instead of the geometric traits --- Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h | 14 +++++++------- Mesh_3/include/CGAL/Mesh_3/Mesher_level.h | 2 +- .../CGAL/Mesh_3/Protect_edges_sizing_field.h | 9 +++++---- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h b/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h index f0b8c722779..10d423e8bd2 100644 --- a/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h +++ b/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h @@ -633,15 +633,15 @@ class C3T3_helpers typedef typename C3T3::Triangulation Tr; typedef Tr Triangulation; typedef typename Tr::Geom_traits Gt; + typedef typename Tr::Bare_point Bare_point; + typedef typename Tr::Weighted_point Weighted_point; - typedef typename Gt::Vector_3 Vector_3; - typedef typename Gt::Bare_point Bare_point; - typedef typename Gt::Weighted_point_3 Weighted_point; - typedef typename Gt::Plane_3 Plane_3; - typedef typename Gt::FT FT; - typedef typename Gt::Tetrahedron_3 Tetrahedron; + typedef typename Gt::Vector_3 Vector_3; + typedef typename Gt::Plane_3 Plane_3; + typedef typename Gt::FT FT; + typedef typename Gt::Tetrahedron_3 Tetrahedron; - typedef typename Gt::Construct_point_3 Construct_point_3; + typedef typename Gt::Construct_point_3 Construct_point_3; typedef typename Gt::Construct_weighted_point_3 Construct_weighted_point_3; typedef typename Tr::Vertex_handle Vertex_handle; diff --git a/Mesh_3/include/CGAL/Mesh_3/Mesher_level.h b/Mesh_3/include/CGAL/Mesh_3/Mesher_level.h index a4e6b2daf27..3e621d18072 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Mesher_level.h +++ b/Mesh_3/include/CGAL/Mesh_3/Mesher_level.h @@ -149,7 +149,7 @@ public: /** Type of point that are inserted into the triangulation. */ typedef typename Triangulation::Point Point; /** Type of point with no weight */ - typedef typename Triangulation::Geom_traits::Bare_point Bare_point; + typedef typename Triangulation::Bare_point Bare_point; /** Type of vertex handles that are returns by insertions into the triangulation. */ typedef typename Triangulation::Vertex_handle Vertex_handle; diff --git a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h index 93559ab99b7..e02713e5ae0 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h +++ b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h @@ -93,11 +93,12 @@ class Protect_edges_sizing_field public: typedef typename C3T3::Triangulation Tr; typedef typename Tr::Geom_traits Gt; - typedef typename Gt::FT FT; - typedef typename Gt::Weighted_point_3 Weighted_point; - typedef typename Gt::Point_3 Bare_point; + typedef typename Tr::Bare_point Bare_point; + typedef typename Tr::Weighted_point Weighted_point; typedef typename Weighted_point::Weight Weight; - + + typedef typename Gt::FT FT; + typedef typename C3T3::Cell_handle Cell_handle; typedef typename C3T3::Vertex_handle Vertex_handle; typedef typename C3T3::Triangulation Triangulation;