From f3c61898a93f582aefda62acdb34da28696c0aed Mon Sep 17 00:00:00 2001 From: Aymeric PELLE Date: Wed, 9 Sep 2015 13:51:27 +0200 Subject: [PATCH] Fix P3RT_traits_3. The traits was badly filtered. --- ..._3_regular_triangulation_filtered_traits_3.h | 6 +++--- .../Periodic_3_regular_triangulation_traits_3.h | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_filtered_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_filtered_traits_3.h index 8eb04759220..7b9a006ff9a 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_filtered_traits_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_filtered_traits_3.h @@ -40,14 +40,14 @@ template < typename K, typename Off > class Periodic_3_regular_triangulation_filtered_traits_base_3 : public Periodic_3_regular_triangulation_traits_base_3 { - typedef Periodic_3_regular_triangulation_traits_base_3 Base; + typedef Periodic_3_regular_triangulation_traits_3 Base; // Exact traits is based on the exact kernel. - typedef Periodic_3_regular_triangulation_traits_base_3 Exact_traits; // Filtering traits is based on the filtering kernel. - typedef Periodic_3_regular_triangulation_traits_base_3 Filtering_traits; private: diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_traits_3.h index 34360e5a50c..e2548de6b93 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_traits_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_traits_3.h @@ -193,10 +193,25 @@ template class Periodic_3_regular_triangulation_filtered_traits_3; template -class Periodic_3_regular_triangulation_traits_3: public Periodic_3_regular_triangulation_filtered_traits_3 +class Periodic_3_regular_triangulation_traits_3: public Periodic_3_regular_triangulation_traits_base_3 { }; +template < typename CK, typename Weight, typename Off > +class Periodic_3_regular_triangulation_traits_3, Weight >, Off> +: public Periodic_3_regular_triangulation_filtered_traits_3, Weight >, Off> +{ +public: + typedef Filtered_kernel Kernel; +}; + +template < class Weight, class Off > +class Periodic_3_regular_triangulation_traits_3, Off> + : public Periodic_3_regular_triangulation_filtered_traits_3, Off> +{ + typedef CGAL::Epick Kernel; +}; + } //namespace CGAL #endif