From 8bf35302862aab773e4c6d87c5cabbbea2f281c2 Mon Sep 17 00:00:00 2001 From: Manuel Caroli Date: Wed, 6 May 2009 14:41:16 +0000 Subject: [PATCH] bugfix --- .../Periodic_3_triangulation_filtered_traits_3.h | 6 +++--- .../CGAL/Periodic_3_triangulation_traits_3.h | 13 ++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_filtered_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_filtered_traits_3.h index ff0abaa7fd3..0045d8df258 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_filtered_traits_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_filtered_traits_3.h @@ -466,14 +466,14 @@ class Periodic_3_triangulation_filtered_traits_base_3 // Filtering traits is based on the filtering kernel. typedef Periodic_3_triangulation_traits_3 Filtering_traits; - +private: typedef typename K::C2E C2E; typedef typename K::C2F C2F; typedef typename C2E::Target_kernel::Iso_cuboid_3 Exact_iso_cuboid_3; typedef typename C2F::Target_kernel::Iso_cuboid_3 Approximate_iso_cuboid_3; - +protected: #ifndef CGAL_CFG_MATCHING_BUG_6 using Base::_domain; #endif @@ -574,7 +574,7 @@ CGAL_BEGIN_NAMESPACE template < typename K > class Periodic_3_triangulation_filtered_traits_3 : public Periodic_3_triangulation_statically_filtered_traits_3< - Periodic_3_triangulation_filtered_traits_base_3 > { + Periodic_3_triangulation_filtered_traits_base_3 > { }; CGAL_END_NAMESPACE diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_traits_3.h index c147790bf47..371f7202c38 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_traits_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_traits_3.h @@ -237,14 +237,12 @@ public: return Construct_circumcenter_3(&_domain); } -public: +protected: Iso_cuboid_3 _domain; }; - template < class K, class Off = CGAL::Periodic_3_offset_3 > -class Periodic_3_triangulation_traits_3 - : public Periodic_3_triangulation_traits_base_3 -{}; +template < typename K, typename Off = CGAL::Periodic_3_offset_3 > +class Periodic_3_triangulation_traits_3; CGAL_END_NAMESPACE @@ -267,6 +265,11 @@ public: typedef Filtered_kernel Kernel; }; +template < class K, class Off > +class Periodic_3_triangulation_traits_3 + : public Periodic_3_triangulation_traits_base_3 +{}; + CGAL_END_NAMESPACE #endif // CGAL_PERIODIC_3_TRIANGULATION_TRAITS_3_H