From 38312c1e637703c79fe648b64c8cdd6d0165e648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 14 Feb 2023 10:04:03 +0100 Subject: [PATCH] Use 'FT' as template parameter rather than 'Traits' --- .../CGAL/Straight_skeleton_halfedge_base_2.h | 15 ++++++--------- .../include/CGAL/Straight_skeleton_items_2.h | 3 ++- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_halfedge_base_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_halfedge_base_2.h index e4df941702c..0b500856171 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_halfedge_base_2.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_halfedge_base_2.h @@ -19,7 +19,7 @@ namespace CGAL { -template < class Refs, class Traits > +template < class Refs, class FT > class Straight_skeleton_halfedge_base_base_2 { public: @@ -38,9 +38,7 @@ public: typedef typename Refs::Vertex Vertex; typedef typename Refs::Face Face; - typedef typename Traits::FT FT; - - typedef Straight_skeleton_halfedge_base_base_2 Base_base ; + typedef Straight_skeleton_halfedge_base_base_2 Base_base ; protected: @@ -95,7 +93,6 @@ public: Halfedge_const_handle defining_contour_edge() const { return this->face()->halfedge() ; } Halfedge_handle defining_contour_edge() { return this->face()->halfedge() ; } - // @fixme below is not documented in the `StraightSkeletonHalfedge_2` concept Sign slope() const { return mSlope ; } void set_slope( Sign aSlope ) { mSlope = aSlope ; } @@ -114,8 +111,8 @@ private: FT mWeight ; }; -template < class Refs, class Traits > -class Straight_skeleton_halfedge_base_2 : public Straight_skeleton_halfedge_base_base_2 +template < class Refs, class FT > +class Straight_skeleton_halfedge_base_2 : public Straight_skeleton_halfedge_base_base_2 { public: @@ -123,8 +120,8 @@ public: typedef typename Refs::Halfedge_handle Halfedge_handle; typedef typename Refs::Face_handle Face_handle; - typedef Straight_skeleton_halfedge_base_base_2 Base_base ; - typedef Straight_skeleton_halfedge_base_2 Base ; + typedef Straight_skeleton_halfedge_base_base_2 Base_base ; + typedef Straight_skeleton_halfedge_base_2 Base ; Straight_skeleton_halfedge_base_2() {} diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_items_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_items_2.h index fce063eb75c..59be168ec0b 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_items_2.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_items_2.h @@ -35,7 +35,8 @@ public: template struct Halfedge_wrapper { - typedef Straight_skeleton_halfedge_base_2 < Refs, Traits > Halfedge; + typedef typename Traits::FT FT ; + typedef Straight_skeleton_halfedge_base_2 < Refs, FT > Halfedge; }; template