From af86bfca8b470968f68ef4613cc22dc092ace492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?=
 <mael.rouxel.labbe@geometryfactory.com>
Date: Tue, 22 Aug 2017 13:38:31 +0200
Subject: [PATCH] Renamed P3T3's offset-handling functors (added a _3 suffix)

---
 ...riodic_3_Delaunay_triangulation_traits_3.h | 14 ++++++-------
 ...eriodic_3_regular_triangulation_traits_3.h | 14 ++++++-------
 .../CGAL/Periodic_3_triangulation_traits_3.h  | 13 ++++++------
 ...=> Functor_with_offset_points_adaptor_3.h} | 12 +++++------
 ...r_with_offset_weighted_points_adaptor_3.h} | 20 +++++++++----------
 5 files changed, 37 insertions(+), 36 deletions(-)
 rename Periodic_3_triangulation_3/include/CGAL/internal/{Functor_with_offset_points_adaptor.h => Functor_with_offset_points_adaptor_3.h} (89%)
 rename Periodic_3_triangulation_3/include/CGAL/internal/{Functor_with_offset_weighted_points_adaptor.h => Functor_with_offset_weighted_points_adaptor_3.h} (89%)

diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_Delaunay_triangulation_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_Delaunay_triangulation_traits_3.h
index 0a71cd2075a..57209422c9a 100644
--- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_Delaunay_triangulation_traits_3.h
+++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_Delaunay_triangulation_traits_3.h
@@ -26,7 +26,7 @@
 #include <CGAL/license/Periodic_3_triangulation_3.h>
 
 #include <CGAL/internal/Periodic_3_construct_point_3.h>
-#include <CGAL/internal/Functor_with_offset_points_adaptor.h>
+#include <CGAL/internal/Functor_with_offset_points_adaptor_3.h>
 #include <CGAL/Periodic_3_offset_3.h>
 #include <CGAL/Periodic_3_triangulation_traits_3.h>
 
@@ -68,23 +68,23 @@ public:
   { }
 
   // Delaunay specific predicates
-  typedef Functor_with_offset_points_adaptor<Self, typename K::Side_of_oriented_sphere_3>
+  typedef Functor_with_offset_points_adaptor_3<Self, typename K::Side_of_oriented_sphere_3>
       Side_of_oriented_sphere_3;
-  typedef Functor_with_offset_points_adaptor<Self, typename K::Compare_distance_3>
+  typedef Functor_with_offset_points_adaptor_3<Self, typename K::Compare_distance_3>
       Compare_distance_3;
 
   // Required for Periodic_3_Delaunay_triangulation_remove_traits
-  typedef Functor_with_offset_points_adaptor<Self, typename K::Coplanar_orientation_3>
+  typedef Functor_with_offset_points_adaptor_3<Self, typename K::Coplanar_orientation_3>
       Coplanar_orientation_3;
-  typedef Functor_with_offset_points_adaptor<Self, typename K::Coplanar_side_of_bounded_circle_3>
+  typedef Functor_with_offset_points_adaptor_3<Self, typename K::Coplanar_side_of_bounded_circle_3>
       Coplanar_side_of_bounded_circle_3;
 
   // When is_Gabriel is used
-   typedef Functor_with_offset_points_adaptor<Self, typename K::Side_of_bounded_sphere_3>
+   typedef Functor_with_offset_points_adaptor_3<Self, typename K::Side_of_bounded_sphere_3>
        Side_of_bounded_sphere_3;
 
   // Delaunay specific constructions
-  typedef Functor_with_offset_points_adaptor<Self, typename K::Construct_circumcenter_3>
+  typedef Functor_with_offset_points_adaptor_3<Self, typename K::Construct_circumcenter_3>
       Construct_circumcenter_3;
 
   using Base::construct_point_3_object;
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 5024e19a245..7ad4c3718b7 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
@@ -25,7 +25,7 @@
 
 #include <CGAL/license/Periodic_3_triangulation_3.h>
 
-#include <CGAL/internal/Functor_with_offset_weighted_points_adaptor.h>
+#include <CGAL/internal/Functor_with_offset_weighted_points_adaptor_3.h>
 #include <CGAL/internal/Periodic_3_construct_weighted_point_3.h>
 #include <CGAL/Periodic_3_offset_3.h>
 #include <CGAL/Periodic_3_triangulation_traits_3.h>
@@ -68,23 +68,23 @@ public:
   typedef Periodic_3_construct_weighted_point_3<Self, typename K::Construct_weighted_point_3>
       Construct_weighted_point_3;
 
-  typedef Functor_with_offset_weighted_points_adaptor<Self, typename K::Power_side_of_oriented_power_sphere_3>
+  typedef Functor_with_offset_weighted_points_adaptor_3<Self, typename K::Power_side_of_oriented_power_sphere_3>
       Power_side_of_oriented_power_sphere_3;
-  typedef Functor_with_offset_weighted_points_adaptor<Self, typename K::Compare_weighted_squared_radius_3>
+  typedef Functor_with_offset_weighted_points_adaptor_3<Self, typename K::Compare_weighted_squared_radius_3>
       Compare_weighted_squared_radius_3;
-  typedef Functor_with_offset_weighted_points_adaptor<Self, typename K::Compare_power_distance_3>
+  typedef Functor_with_offset_weighted_points_adaptor_3<Self, typename K::Compare_power_distance_3>
       Compare_power_distance_3;
 
   // Undocumented, requried for Is_Gabriel (Alpha shapes)
-  typedef Functor_with_offset_weighted_points_adaptor<Self, typename K::Power_side_of_bounded_power_sphere_3>
+  typedef Functor_with_offset_weighted_points_adaptor_3<Self, typename K::Power_side_of_bounded_power_sphere_3>
       Power_side_of_bounded_power_sphere_3;
 
   // Required for Periodic_3_regular_remove_traits
-  typedef Functor_with_offset_weighted_points_adaptor<Self, typename K::Coplanar_orientation_3>
+  typedef Functor_with_offset_weighted_points_adaptor_3<Self, typename K::Coplanar_orientation_3>
        Coplanar_orientation_3;
 
   // When dual operations are used
-  typedef Functor_with_offset_weighted_points_adaptor<Self, typename K::Construct_weighted_circumcenter_3>
+  typedef Functor_with_offset_weighted_points_adaptor_3<Self, typename K::Construct_weighted_circumcenter_3>
       Construct_weighted_circumcenter_3;
 
   // Operations
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 12ccbdf6698..54bbdf725cd 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
@@ -14,6 +14,7 @@
 //
 // Author(s)     : Nico Kruithof <Nico.Kruithof@sophia.inria.fr>
 //                 Manuel Caroli <Manuel.Caroli@sophia.inria.fr>
+//                 Mael Rouxel-Labbé
 
 #ifndef CGAL_PERIODIC_3_TRIANGULATION_TRAITS_3_H
 #define CGAL_PERIODIC_3_TRIANGULATION_TRAITS_3_H
@@ -21,7 +22,7 @@
 #include <CGAL/license/Periodic_3_triangulation_3.h>
 
 #include <CGAL/internal/Periodic_3_construct_point_3.h>
-#include <CGAL/internal/Functor_with_offset_points_adaptor.h>
+#include <CGAL/internal/Functor_with_offset_points_adaptor_3.h>
 #include <CGAL/Periodic_3_offset_3.h>
 
 #include <CGAL/basic.h>
@@ -83,17 +84,17 @@ public:
       Construct_point_3;
 
   // Triangulation predicates
-  typedef Functor_with_offset_points_adaptor<Self, typename K::Compare_xyz_3>
+  typedef Functor_with_offset_points_adaptor_3<Self, typename K::Compare_xyz_3>
       Compare_xyz_3;
-  typedef Functor_with_offset_points_adaptor<Self, typename K::Orientation_3>
+  typedef Functor_with_offset_points_adaptor_3<Self, typename K::Orientation_3>
       Orientation_3;
 
   // Triangulation constructions
-  typedef Functor_with_offset_points_adaptor<Self, typename K::Construct_segment_3>
+  typedef Functor_with_offset_points_adaptor_3<Self, typename K::Construct_segment_3>
       Construct_segment_3;
-  typedef Functor_with_offset_points_adaptor<Self, typename K::Construct_triangle_3>
+  typedef Functor_with_offset_points_adaptor_3<Self, typename K::Construct_triangle_3>
       Construct_triangle_3;
-  typedef Functor_with_offset_points_adaptor<Self, typename K::Construct_tetrahedron_3>
+  typedef Functor_with_offset_points_adaptor_3<Self, typename K::Construct_tetrahedron_3>
       Construct_tetrahedron_3;
 
   // Operations
diff --git a/Periodic_3_triangulation_3/include/CGAL/internal/Functor_with_offset_points_adaptor.h b/Periodic_3_triangulation_3/include/CGAL/internal/Functor_with_offset_points_adaptor_3.h
similarity index 89%
rename from Periodic_3_triangulation_3/include/CGAL/internal/Functor_with_offset_points_adaptor.h
rename to Periodic_3_triangulation_3/include/CGAL/internal/Functor_with_offset_points_adaptor_3.h
index 8a421a9dd31..b043870dcb1 100644
--- a/Periodic_3_triangulation_3/include/CGAL/internal/Functor_with_offset_points_adaptor.h
+++ b/Periodic_3_triangulation_3/include/CGAL/internal/Functor_with_offset_points_adaptor_3.h
@@ -19,15 +19,15 @@
 //                 Manuel Caroli <Manuel.Caroli@sophia.inria.fr>
 //                 Aymeric Pellé <Aymeric.Pelle@sophia.inria.fr>
 //                 Mael Rouxel-Labbé
-#ifndef CGAL_FUNCTOR_WITH_OFFSET_POINTS_ADAPTOR_H
-#define CGAL_FUNCTOR_WITH_OFFSET_POINTS_ADAPTOR_H
+#ifndef CGAL_FUNCTOR_WITH_OFFSET_POINTS_ADAPTOR_3_H
+#define CGAL_FUNCTOR_WITH_OFFSET_POINTS_ADAPTOR_3_H
 
 #include <CGAL/license/Periodic_3_triangulation_3.h>
 
 namespace CGAL {
 
 template < class K_, class Functor_ >
-class Functor_with_offset_points_adaptor
+class Functor_with_offset_points_adaptor_3
   : public Functor_
 {
   typedef K_                                    Kernel;
@@ -41,8 +41,8 @@ class Functor_with_offset_points_adaptor
 public:
   typedef typename Functor::result_type         result_type;
 
-  Functor_with_offset_points_adaptor(const Functor& functor,
-                                     const Construct_point_3& cp)
+  Functor_with_offset_points_adaptor_3(const Functor& functor,
+                                       const Construct_point_3& cp)
     : Functor_(functor), cp(cp)
   { }
 
@@ -75,4 +75,4 @@ public:
 
 }  // namespace CGAL
 
-#endif /* CGAL_FUNCTOR_WITH_OFFSET_POINTS_ADAPTOR_H */
+#endif /* CGAL_FUNCTOR_WITH_OFFSET_POINTS_ADAPTOR_3_H */
diff --git a/Periodic_3_triangulation_3/include/CGAL/internal/Functor_with_offset_weighted_points_adaptor.h b/Periodic_3_triangulation_3/include/CGAL/internal/Functor_with_offset_weighted_points_adaptor_3.h
similarity index 89%
rename from Periodic_3_triangulation_3/include/CGAL/internal/Functor_with_offset_weighted_points_adaptor.h
rename to Periodic_3_triangulation_3/include/CGAL/internal/Functor_with_offset_weighted_points_adaptor_3.h
index ae3cd8051c2..2c2b4596d53 100644
--- a/Periodic_3_triangulation_3/include/CGAL/internal/Functor_with_offset_weighted_points_adaptor.h
+++ b/Periodic_3_triangulation_3/include/CGAL/internal/Functor_with_offset_weighted_points_adaptor_3.h
@@ -23,20 +23,20 @@
 //                 Manuel Caroli <Manuel.Caroli@sophia.inria.fr>
 //                 Aymeric Pellé <Aymeric.Pelle@sophia.inria.fr>
 //                 Mael Rouxel-Labbé
-#ifndef CGAL_FUNCTOR_WITH_OFFSET_WEIGHTED_POINTS_ADAPTOR_H
-#define CGAL_FUNCTOR_WITH_OFFSET_WEIGHTED_POINTS_ADAPTOR_H
+#ifndef CGAL_FUNCTOR_WITH_OFFSET_WEIGHTED_POINTS_ADAPTOR_3_H
+#define CGAL_FUNCTOR_WITH_OFFSET_WEIGHTED_POINTS_ADAPTOR_3_H
 
 #include <CGAL/license/Periodic_3_triangulation_3.h>
 
-#include <CGAL/internal/Functor_with_offset_points_adaptor.h>
+#include <CGAL/internal/Functor_with_offset_points_adaptor_3.h>
 
 namespace CGAL {
 
 template < class K_, class Functor_ >
-class Functor_with_offset_weighted_points_adaptor
-  : public Functor_with_offset_points_adaptor<K_, Functor_>
+class Functor_with_offset_weighted_points_adaptor_3
+  : public Functor_with_offset_points_adaptor_3<K_, Functor_>
 {
-  typedef Functor_with_offset_points_adaptor<K_, Functor_>  Base;
+  typedef Functor_with_offset_points_adaptor_3<K_, Functor_>  Base;
 
   typedef K_                                                Kernel;
   typedef Functor_                                          Functor;
@@ -52,9 +52,9 @@ class Functor_with_offset_weighted_points_adaptor
 public:
   typedef typename Functor::result_type                     result_type;
 
-  Functor_with_offset_weighted_points_adaptor(const Functor_& functor,
-                                              const Construct_point_3& cp,
-                                              const Construct_weighted_point_3& wp)
+  Functor_with_offset_weighted_points_adaptor_3(const Functor_& functor,
+                                                const Construct_point_3& cp,
+                                                const Construct_weighted_point_3& wp)
     : Base(functor, cp), wp(wp)
   { }
 
@@ -139,4 +139,4 @@ public:
 
 }  // namespace CGAL
 
-#endif /* CGAL_FUNCTOR_WITH_OFFSET_WEIGHTED_POINTS_ADAPTOR_H */
+#endif /* CGAL_FUNCTOR_WITH_OFFSET_WEIGHTED_POINTS_ADAPTOR_3_H */