From 9c2f9661119ae7ff6edbedd2b06d0bafa1e1e248 Mon Sep 17 00:00:00 2001
From: Efi Fogel <efifogel@gmail.com>
Date: Tue, 20 Jun 2017 12:45:25 +0300
Subject: [PATCH] Cleaned up

---
 .../Arr_bounded_planar_topology_traits_2.h    | 21 +++++++++----------
 .../CGAL/Arr_spherical_topology_traits_2.h    | 21 +++++++++----------
 .../CGAL/Arr_unb_planar_topology_traits_2.h   | 19 ++++++++---------
 3 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h
index a541addea74..6bdd85d4acd 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h
@@ -252,7 +252,7 @@ private:
   // Type definition for the overlay sweep-line visitor.
   template <typename ExtendedGeometryTraits, typename ArrangementA,
             typename ArrangementB>
-  struct _Overlay_helper : public Arr_bounded_planar_overlay_helper<
+  struct Overlay_helper : public Arr_bounded_planar_overlay_helper<
     ExtendedGeometryTraits, ArrangementA, ArrangementB, Arr,
     Arr_overlay_event<ExtendedGeometryTraits, Arr>,
     Arr_overlay_subcurve<ExtendedGeometryTraits, Arr_overlay_event<
@@ -279,7 +279,7 @@ private:
     typedef typename Base::Subcurve                     Subcurve;
     typedef typename Base::Construction_helper          Construction_helper;
 
-    _Overlay_helper(const Arrangement_a* arr_a, const Arrangement_b* arr_b) :
+    Overlay_helper(const Arrangement_a* arr_a, const Arrangement_b* arr_b) :
       Base(arr_a, arr_b)
     {}
   };
@@ -355,11 +355,11 @@ public:
   template <typename ArrangementA, typename ArrangementB,
             typename OverlayTraits>
   struct Surface_sweep_overlay_visitor :
-    public Arr_overlay_sl_visitor<_Overlay_helper<Arr_overlay_traits_2<
-                                                    Arr_traits_basic_adaptor_2<
-                                                      Geometry_traits_2>,
-                                                    ArrangementA, ArrangementB>,
-                                                  ArrangementA, ArrangementB>,
+    public Arr_overlay_sl_visitor<Overlay_helper<Arr_overlay_traits_2<
+                                                   Arr_traits_basic_adaptor_2<
+                                                     Geometry_traits_2>,
+                                                   ArrangementA, ArrangementB>,
+                                                 ArrangementA, ArrangementB>,
                                   OverlayTraits,
                                   Surface_sweep_overlay_visitor<ArrangementA,
                                                                 ArrangementB,
@@ -374,16 +374,15 @@ public:
                                  Arrangement_a, Arrangement_b>
                                                         Geom_ovl_traits_2;
 
-    typedef _Overlay_helper<Geom_ovl_traits_2, Arrangement_a, Arrangement_b>
+    typedef Overlay_helper<Geom_ovl_traits_2, Arrangement_a, Arrangement_b>
                                                         Ovl_helper;
 
-    typedef Surface_sweep_overlay_visitor<ArrangementA, ArrangementB,
-                                          OverlayTraits>
+    typedef Surface_sweep_overlay_visitor<Arrangement_a, Arrangement_b,
+                                          Overlay_traits>
                                                         Self;
     typedef Arr_overlay_sl_visitor<Ovl_helper, Overlay_traits, Self>
                                                         Base;
 
-    // typedef typename Base::Geometry_traits_2            Geometry_traits_2;
     typedef typename Base::Event                        Event;
     typedef typename Base::Subcurve                     Subcurve;
 
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
index cdb3fdc47ce..d9b2f8b7359 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
@@ -368,7 +368,7 @@ private:
   // Type definition for the overlay sweep-line visitor.
   template <typename ExtendedGeometryTraits_2, typename ArrangementA,
             typename ArrangementB>
-  struct _Overlay_helper : public Arr_spherical_overlay_helper<
+  struct Overlay_helper : public Arr_spherical_overlay_helper<
     ExtendedGeometryTraits_2, ArrangementA, ArrangementB, Arr,
     Arr_overlay_event<ExtendedGeometryTraits_2, Arr>,
     Arr_overlay_subcurve<ExtendedGeometryTraits_2, Arr_overlay_event<
@@ -394,7 +394,7 @@ private:
     typedef typename Base::Subcurve                     Subcurve;
     typedef typename Base::Construction_helper          Construction_helper;
 
-    _Overlay_helper(const Arrangement_a* arr_a, const Arrangement_b* arr_b) :
+    Overlay_helper(const Arrangement_a* arr_a, const Arrangement_b* arr_b) :
       Base(arr_a, arr_b)
     {}
   };
@@ -467,11 +467,11 @@ public:
   template <typename ArrangementA, typename ArrangementB,
             typename OverlayTraits>
   struct Surface_sweep_overlay_visitor :
-    public Arr_overlay_sl_visitor<_Overlay_helper<Arr_overlay_traits_2<
-                                                    Gt2,
-                                                    ArrangementA,
-                                                    ArrangementB>,
-                                                  ArrangementA, ArrangementB>,
+    public Arr_overlay_sl_visitor<Overlay_helper<Arr_overlay_traits_2<
+                                                   Gt2,
+                                                   ArrangementA,
+                                                   ArrangementB>,
+                                                 ArrangementA, ArrangementB>,
                                   OverlayTraits,
                                   Surface_sweep_overlay_visitor<ArrangementA,
                                                                 ArrangementB,
@@ -485,16 +485,15 @@ public:
     typedef Arr_overlay_traits_2<Gt2, Arrangement_a,
                                  Arrangement_b>         Geom_ovl_traits_2;
 
-    typedef _Overlay_helper<Geom_ovl_traits_2, Arrangement_a, Arrangement_b>
+    typedef Overlay_helper<Geom_ovl_traits_2, Arrangement_a, Arrangement_b>
                                                         Ovl_helper;
 
-    typedef Surface_sweep_overlay_visitor<ArrangementA, ArrangementB,
-                                          OverlayTraits>
+    typedef Surface_sweep_overlay_visitor<Arrangement_a, Arrangement_b,
+                                          Overlay_traits>
                                                         Self;
     typedef Arr_overlay_sl_visitor<Ovl_helper, Overlay_traits, Self>
                                                         Base;
 
-    // typedef typename Base::Geometry_traits_2            Geometry_traits_2;
     typedef typename Base::Event                        Event;
     typedef typename Base::Subcurve                     Subcurve;
 
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h
index ee5c8f5a7f6..9193b68ba75 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h
@@ -264,7 +264,7 @@ private:
   // Type definition for the overlay surface-sweep visitor.
   template <typename ExtendedGeometryTraits, typename ArrangementA,
             typename ArrangementB>
-  struct _Overlay_helper : public Arr_unb_planar_overlay_helper<
+  struct Overlay_helper : public Arr_unb_planar_overlay_helper<
     ExtendedGeometryTraits, ArrangementA, ArrangementB, Arr,
     Arr_overlay_event<ExtendedGeometryTraits, Arr>,
     Arr_overlay_subcurve<ExtendedGeometryTraits, Arr_overlay_event<
@@ -290,7 +290,7 @@ private:
     typedef typename Base::Subcurve                     Subcurve;
     typedef typename Base::Construction_helper          Construction_helper;
 
-    _Overlay_helper(const ArrangementA* arr_a, const ArrangementB* arr_b) :
+    Overlay_helper(const ArrangementA* arr_a, const ArrangementB* arr_b) :
       Base(arr_a, arr_b) {}
   };
   //@}
@@ -363,10 +363,10 @@ public:
   template <typename ArrangementA, typename ArrangementB,
             typename OverlayTraits>
   struct Surface_sweep_overlay_visitor :
-    public Arr_overlay_sl_visitor<_Overlay_helper<Arr_overlay_traits_2<
-                                                    Gt2,
-                                                    ArrangementA, ArrangementB>,
-                                                  ArrangementA, ArrangementB>,
+    public Arr_overlay_sl_visitor<Overlay_helper<Arr_overlay_traits_2<
+                                                   Gt2,
+                                                   ArrangementA, ArrangementB>,
+                                                 ArrangementA, ArrangementB>,
                                   OverlayTraits,
                                   Surface_sweep_overlay_visitor<ArrangementA,
                                                                 ArrangementB,
@@ -380,17 +380,16 @@ public:
     typedef Arr_overlay_traits_2<Gt2, Arrangement_a, Arrangement_b>
                                                         Geom_ovl_traits_2;
 
-    typedef _Overlay_helper<Geom_ovl_traits_2, Arrangement_a, Arrangement_b>
+    typedef Overlay_helper<Geom_ovl_traits_2, Arrangement_a, Arrangement_b>
                                                         Ovl_helper;
 
-    typedef Surface_sweep_overlay_visitor<ArrangementA, ArrangementB,
-                                          OverlayTraits>
+    typedef Surface_sweep_overlay_visitor<Arrangement_a, Arrangement_b,
+                                          Overlay_traits>
                                                         Self;
     typedef Arr_overlay_sl_visitor<Ovl_helper, Overlay_traits, Self>
                                                         Base;
 
 
-    // typedef typename Base::Geometry_traits_2            Geometry_traits_2;
     typedef typename Base::Event                        Event;
     typedef typename Base::Subcurve                     Subcurve;