Consistently grab the Bare_point typedef from the triangulation

instead of the geometric traits
This commit is contained in:
Mael Rouxel-Labbé 2017-04-04 17:49:47 +02:00
parent 2099041a30
commit 98ae96281e
3 changed files with 13 additions and 12 deletions

View File

@ -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;

View File

@ -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;

View File

@ -112,11 +112,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;