From e21a48a30605313044296e4080aec3cb15b97d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sebastien.loriot@cgal.org>
Date: Tue, 8 Mar 2016 15:01:02 +0100
Subject: [PATCH] use Has_filtered_predicates flag for selecting base traits

---
 .../CGAL/Periodic_3_regular_triangulation_3.h |  2 +-
 ...eriodic_3_regular_triangulation_traits_3.h | 31 +++++++------------
 ...riodic_3_triangulation_filtered_traits_3.h |  1 +
 ..._regular_triangulation_filtered_traits_3.h |  0
 ..._3_regular_triangulation_remove_traits_3.h |  0
 5 files changed, 13 insertions(+), 21 deletions(-)
 rename Periodic_3_triangulation_3/include/CGAL/{ => internal}/Periodic_3_regular_triangulation_filtered_traits_3.h (100%)
 rename Periodic_3_triangulation_3/include/CGAL/{ => internal}/Periodic_3_regular_triangulation_remove_traits_3.h (100%)

diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h
index 7b4d862d998..6279f496f72 100644
--- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h
+++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h
@@ -25,7 +25,7 @@
 #include <CGAL/spatial_sort.h>
 
 // Needed by remove to fill the hole.
-#include <CGAL/Periodic_3_regular_triangulation_remove_traits_3.h>
+#include <CGAL/internal/Periodic_3_regular_triangulation_remove_traits_3.h>
 #include <CGAL/Regular_triangulation_3.h>
 
 #include <boost/unordered_set.hpp>
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 5f00cc4024b..b437ea12fd6 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
@@ -197,40 +197,31 @@ protected:
 	Iso_cuboid_3 _domain;
 };
 
-template<typename K, typename Off = CGAL::Periodic_3_offset_3>
+template<typename RT, typename Off = CGAL::Periodic_3_offset_3, bool Has_filtered_predicates = RT::Has_filtered_predicates>
 class Periodic_3_regular_triangulation_traits_3;
 } // namespace CGAL
 
 // Partial specialization for Filtered_kernel<CK>.
-#include <CGAL/Filtered_kernel.h>
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Periodic_3_regular_triangulation_filtered_traits_3.h>
+#include <CGAL/internal/Periodic_3_regular_triangulation_filtered_traits_3.h>
 
 namespace CGAL
 {
 
 // This declaration is needed to break the cyclic dependency.
-template<typename K, typename Off>
+template<typename RT, typename Off>
 class Periodic_3_regular_triangulation_filtered_traits_3;
 
-template<class K, class Off>
-class Periodic_3_regular_triangulation_traits_3: public Periodic_3_regular_triangulation_traits_base_3<K, Off>
-{
-};
+template<class RT, class Off, bool Has_filtered_predicates>
+class Periodic_3_regular_triangulation_traits_3:
+  public Periodic_3_regular_triangulation_traits_base_3<RT, Off>
+{};
 
-template < typename CK, typename  Weight, typename Off >
-class Periodic_3_regular_triangulation_traits_3<CGAL::Regular_triangulation_euclidean_traits_3< Filtered_kernel<CK>, Weight >, Off>
-: public Periodic_3_regular_triangulation_filtered_traits_3<CGAL::Regular_triangulation_euclidean_traits_3< Filtered_kernel<CK>, Weight >, Off>
+template < typename RT, typename Off >
+class Periodic_3_regular_triangulation_traits_3<RT, Off, true>
+: public Periodic_3_regular_triangulation_filtered_traits_3<RT, Off>
 {
 public:
-  typedef Filtered_kernel<CK>  Kernel;
-};
-
-template < class Weight, class Off >
-class Periodic_3_regular_triangulation_traits_3<CGAL::Regular_triangulation_euclidean_traits_3< CGAL::Epick, Weight >, Off>
-  : public Periodic_3_regular_triangulation_filtered_traits_3<CGAL::Regular_triangulation_euclidean_traits_3< CGAL::Epick, Weight >, Off>
-{
-  typedef CGAL::Epick Kernel;
+  typedef RT  Kernel;
 };
 
 } //namespace CGAL
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 91639268f90..177fcb221da 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
@@ -30,6 +30,7 @@
 #include <CGAL/Interval_nt.h>
 #include <CGAL/Uncertain.h>
 #include <CGAL/Profile_counter.h>
+#include <CGAL/Filtered_predicate.h>
 
 namespace CGAL {
 
diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_filtered_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_regular_triangulation_filtered_traits_3.h
similarity index 100%
rename from Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_filtered_traits_3.h
rename to Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_regular_triangulation_filtered_traits_3.h
diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_remove_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_regular_triangulation_remove_traits_3.h
similarity index 100%
rename from Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_remove_traits_3.h
rename to Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_regular_triangulation_remove_traits_3.h