From e23d76cfab02d13bfb01c18abcb0e7108e6d9170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?=
 <mael.rouxel.labbe@geometryfactory.com>
Date: Fri, 17 May 2019 14:47:31 +0200
Subject: [PATCH] Cosmetic changes

---
 .../CGAL/Intersections_2/Circle_2_Line_2.h    | 36 +++++--------------
 Intersections_2/include/CGAL/intersection_2.h |  5 ++-
 2 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/Intersections_2/include/CGAL/Intersections_2/Circle_2_Line_2.h b/Intersections_2/include/CGAL/Intersections_2/Circle_2_Line_2.h
index c678fa3b426..49e7e90183b 100644
--- a/Intersections_2/include/CGAL/Intersections_2/Circle_2_Line_2.h
+++ b/Intersections_2/include/CGAL/Intersections_2/Circle_2_Line_2.h
@@ -30,6 +30,7 @@
 #include <CGAL/Circle_2.h>
 #include <CGAL/Line_2.h>
 #include <CGAL/squared_distance_2_1.h>
+#include <CGAL/Intersection_traits_2.h>
 
 namespace CGAL {
 namespace Intersections {
@@ -38,45 +39,26 @@ namespace internal {
 template <class K>
 bool
 do_intersect(const typename K::Circle_2 & c, 
-	     const typename K::Line_2& l,
-	     const K&)
+             const typename K::Line_2& l,
+             const K&)
 {
-    return squared_distance(c.center(), l) <= c.squared_radius();
+  return squared_distance(c.center(), l) <= c.squared_radius();
 }
 
 template <class K>
 bool
 do_intersect(const typename K::Line_2& l, 
-	     const typename K::Circle_2 & c,
-	     const K&)
+             const typename K::Circle_2 & c,
+             const K&)
 {
-    return squared_distance(c.center(), l) <= c.squared_radius();
+  return squared_distance(c.center(), l) <= c.squared_radius();
 }
 
 } // namespace internal
 } // namespace Intersections
-  
-template <class K>
-inline
-bool
-do_intersect(const Circle_2<K> & c, 
-	     const Line_2<K> & l)
-{
-  typedef typename K::Do_intersect_2 Do_intersect;
-  return Do_intersect()(c, l);
-}
 
-template <class K>
-inline
-bool
-do_intersect(const Line_2<K> & l, 
-	     const Circle_2<K> & c)
-{
-  typedef typename K::Do_intersect_2 Do_intersect;
-  return Do_intersect()(c, l);
-}
+CGAL_DO_INTERSECT_FUNCTION(Circle_2, Line_2, 2)
 
-
-} //namespace CGAL
+} // namespace CGAL
 
 #endif
diff --git a/Intersections_2/include/CGAL/intersection_2.h b/Intersections_2/include/CGAL/intersection_2.h
index d1672662b5b..b3078e31a5b 100644
--- a/Intersections_2/include/CGAL/intersection_2.h
+++ b/Intersections_2/include/CGAL/intersection_2.h
@@ -31,8 +31,8 @@
 #include <CGAL/Intersections_2/Bbox_2_Circle_2.h>
 #include <CGAL/Intersections_2/Bbox_2_Point_2.h>
 
-#include <CGAL/Intersections_2/Circle_2_Iso_rectangle_2.h>
 #include <CGAL/Intersections_2/Circle_2_Circle_2.h>
+#include <CGAL/Intersections_2/Circle_2_Iso_rectangle_2.h>
 #include <CGAL/Intersections_2/Circle_2_Line_2.h>
 #include <CGAL/Intersections_2/Circle_2_Point_2.h>
 
@@ -49,9 +49,9 @@
 #include <CGAL/Intersections_2/Line_2_Segment_2.h>
 #include <CGAL/Intersections_2/Line_2_Triangle_2.h>
 
+#include <CGAL/Intersections_2/Point_2_Point_2.h>
 #include <CGAL/Intersections_2/Point_2_Ray_2.h>
 #include <CGAL/Intersections_2/Point_2_Segment_2.h>
-#include <CGAL/Intersections_2/Point_2_Point_2.h>
 #include <CGAL/Intersections_2/Point_2_Triangle_2.h>
 
 #include <CGAL/Intersections_2/Ray_2_Ray_2.h>
@@ -63,5 +63,4 @@
 
 #include <CGAL/Intersections_2/Triangle_2_Triangle_2.h>
 
-
 #endif // CGAL_INTERSECTION_2_H