From e0ac2c8ab89755fd56df0b07c4d2d57c55e9e475 Mon Sep 17 00:00:00 2001
From: Monique Teillaud <Monique.Teillaud@sophia.inria.fr>
Date: Mon, 27 Feb 2006 16:52:28 +0000
Subject: [PATCH] Equal

---
 .../Curved_kernel_ref/FunctorEqual.tex        | 11 +++--
 .../Curved_kernel_ref/FunctorsCompare.tex     | 48 +++++++++----------
 .../function_objects_polynomial_circular.h    |  3 +-
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorEqual.tex b/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorEqual.tex
index 552685ada81..ac3dae2ea7b 100644
--- a/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorEqual.tex
+++ b/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorEqual.tex
@@ -14,19 +14,24 @@ An object \ccVar\ of this type must provide in addition:
 
 \ccMemberFunction{bool operator()
 	(const CircularKernel::Circular_arc_point_2 &p0,
-         	const CircularKernel::Circular_arc_point_2 &p1);}
+         const CircularKernel::Circular_arc_point_2 &p1);}
 {For two points.}
 
 \ccMemberFunction{bool operator()
 	(const CircularKernel::Circular_arc_2 &a0,
-         	const CircularKernel::Circular_arc_2 &a1);}
+         const CircularKernel::Circular_arc_2 &a1);}
 {For two arcs.}
 
 \ccMemberFunction{bool operator()
 	(const CircularKernel::Line_arc_2 &a0,
-         	const CircularKernel::Line_arc_2 &a1);}
+         const CircularKernel::Line_arc_2 &a1);}
 {For two segments.}
 
+For the sake of completeness, there must also be an
+\ccc{operator()} taking a \ccc{Line_arc_2} and a
+\ccc{Circular_arc_2} as arguments (in any order) that always 
+returns \ccc{false}.
+
 \ccHasModels
 
 \ccc{Circular_kernel_2::Equal_2;}
diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsCompare.tex b/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsCompare.tex
index 5a5ef05f6a7..8caf5476d73 100644
--- a/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsCompare.tex
+++ b/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsCompare.tex
@@ -13,15 +13,15 @@ An object \ccVar\ of this type must provide in addition:
          const CircularKernel::Circular_arc_point_2 &q );}
 {Compares the $x$-coordinates of $p$ and $q$.}
 
-\ccMemberFunction{Comparison_result operator()
-	(const CircularKernel::Point_2 &p,
-         const CircularKernel::Circular_arc_point_2 &q );}
-{same.}
+%\ccMemberFunction{Comparison_result operator()
+%	(const CircularKernel::Point_2 &p,
+%         const CircularKernel::Circular_arc_point_2 &q );}
+%{same.}
 
-\ccMemberFunction{Comparison_result operator()
-	(const CircularKernel::Circular_arc_point_2 &p,
-         const CircularKernel::Point_2 &q );}
-{same.}
+%\ccMemberFunction{Comparison_result operator()
+%	(const CircularKernel::Circular_arc_point_2 &p,
+%         const CircularKernel::Point_2 &q );}
+%{same.}
 
 \ccHasModels
 
@@ -47,15 +47,15 @@ An object \ccVar\ of this type must provide in addition:
          const CircularKernel::Circular_arc_point_2 &q );}
 {Compares the $y$-coordinates of $p$ and $q$.}
 
-\ccMemberFunction{Comparison_result operator()
-	(const CircularKernel::Point_2 &p,
-         const CircularKernel::Circular_arc_point_2 &q );}
-{same.}
+%\ccMemberFunction{Comparison_result operator()
+%	(const CircularKernel::Point_2 &p,
+%         const CircularKernel::Circular_arc_point_2 &q );}
+%{same.}
 
-\ccMemberFunction{Comparison_result operator()
-	(const CircularKernel::Circular_arc_point_2 &p,
-         const CircularKernel::Point_2 &q );}
-{same.}
+%\ccMemberFunction{Comparison_result operator()
+%	(const CircularKernel::Circular_arc_point_2 &p,
+%         const CircularKernel::Point_2 &q );}
+%{same.}
 
 \ccHasModels
 
@@ -81,15 +81,15 @@ An object \ccVar\ of this type must provide in addition:
          const CircularKernel::Circular_arc_point_2 &q );}
 {Compares $p$ and $q$ according to the lexicographic ordering on $x$- and $y$-coordinates.}
 
-\ccMemberFunction{Comparison_result operator()
-	(const CircularKernel::Point_2 &p,
-         const CircularKernel::Circular_arc_point_2 &q );}
-{same.}
+%\ccMemberFunction{Comparison_result operator()
+%	(const CircularKernel::Point_2 &p,
+%         const CircularKernel::Circular_arc_point_2 &q );}
+%{same.}
 
-\ccMemberFunction{Comparison_result operator()
-	(const CircularKernel::Circular_arc_point_2 &p,
-         const CircularKernel::Point_2 &q );}
-{same.}
+%\ccMemberFunction{Comparison_result operator()
+%	(const CircularKernel::Circular_arc_point_2 &p,
+%         const CircularKernel::Point_2 &q );}
+%{same.}
 
 \ccHasModels
 
diff --git a/Curved_kernel/include/CGAL/Curved_kernel/function_objects_polynomial_circular.h b/Curved_kernel/include/CGAL/Curved_kernel/function_objects_polynomial_circular.h
index b88bfd399a6..585bda37eeb 100644
--- a/Curved_kernel/include/CGAL/Curved_kernel/function_objects_polynomial_circular.h
+++ b/Curved_kernel/include/CGAL/Curved_kernel/function_objects_polynomial_circular.h
@@ -78,6 +78,7 @@ namespace CircularFunctors {
     typedef CGAL::Comparison_result result_type;
     typedef Arity_tag<2>             Arity;
     using CK::Linear_kernel::Compare_y_2::operator();
+
     result_type
     operator() (const Circular_arc_point_2 &p0,
                 const Circular_arc_point_2 &p1) const
@@ -102,11 +103,11 @@ namespace CircularFunctors {
     typedef typename CK::Circular_arc_point_2 Circular_arc_point_2;
     typedef typename CK::Point_2 Point_2;
     
-    
   public:
     typedef CGAL::Comparison_result result_type;
     typedef Arity_tag<2>             Arity;
     using CK::Linear_kernel::Compare_xy_2::operator();
+
     result_type
     operator() (const Circular_arc_point_2 &p0,
                 const Circular_arc_point_2 &p1) const