From 288c4d3cc9e9ffd57100c9f8725e99ff08bbce66 Mon Sep 17 00:00:00 2001
From: Monique Teillaud <Monique.Teillaud@sophia.inria.fr>
Date: Thu, 2 Mar 2006 07:22:41 +0000
Subject: [PATCH] - changes of revision 28952 reintroduced: make_x_monotone
 used instead of the undocumented in progress advanced_make_x_monotone -
 #include <CGAL/kernel_basic.h> removed (?) - cosmetic

---
 .../function_objects_polynomial_circular.h    | 47 ++++---------------
 1 file changed, 8 insertions(+), 39 deletions(-)

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 a0b9cf7b102..d88f944a647 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
@@ -25,13 +25,11 @@
 #ifndef CGAL_CURVED_KERNEL_FUNCTION_OBJECTS_POLYNOMIAL_CIRCULAR_H
 #define CGAL_CURVED_KERNEL_FUNCTION_OBJECTS_POLYNOMIAL_CIRCULAR_H
 
-#include <CGAL/kernel_basic.h>
 #include <CGAL/Curved_kernel/internal_functions_on_circular_arc_2.h>
 #include <CGAL/Curved_kernel/internal_functions_on_line_arc_2.h>
 #include <CGAL/Bbox_2.h>
 #include <CGAL/Object.h>
 
-
 namespace CGAL {
 namespace CircularFunctors {
 
@@ -54,16 +52,6 @@ namespace CircularFunctors {
                 const Circular_arc_point_2 &p1) const
     { return compare_x<CK>(p0, p1);}
 
-//     result_type
-//     operator() (const Circular_arc_point_2 &p0,
-//                 const Point_2 &p1) const
-//     { return compare_x<CK>(p0, p1);}
-
-//     result_type
-//     operator() (const Point_2 &p0,
-//                 const Circular_arc_point_2 &p1) const
-//     { return compare_x<CK>(p0, p1);}
-
   };
 
 
@@ -85,16 +73,6 @@ namespace CircularFunctors {
                 const Circular_arc_point_2 &p1) const
     {return compare_y<CK>(p0, p1);}
 
-//     result_type
-//     operator() (const Point_2 &p0,
-//                 const Circular_arc_point_2 &p1) const
-//     { return compare_y<CK>(p0, p1);}
-
-//     result_type
-//     operator() (const Circular_arc_point_2 &p0,
-//                 const Point_2 &p1) const
-//     { return compare_y<CK>(p0, p1);}
-
   };
 
   template < class CK >
@@ -115,16 +93,6 @@ namespace CircularFunctors {
                 const Circular_arc_point_2 &p1) const
     { return compare_xy<CK>(p0, p1);}
 
-//     result_type
-//     operator() (const Point_2 &p0,
-//                 const Circular_arc_point_2 &p1) const
-//     { return compare_xy<CK>(p0, p1);}
-
-//     result_type
-//     operator() (const Circular_arc_point_2 &p0,
-//                 const Point_2 &p1) const
-//     { return compare_xy<CK>(p0, p1);}
-
   };
 
   template < class CK >
@@ -320,13 +288,16 @@ namespace CircularFunctors {
       { 
         std::vector< std::pair<Object,bool> > vec;
 
-        advanced_make_x_monotone<CK> (A, std::back_inserter(vec));
-//return    make_x_monotone<CK> (A, res);
+	return    make_x_monotone<CK> (A, res);
 
-        for(unsigned i=0;i<vec.size();++i)
-          *res++=vec.at(i).first;       
+//         advanced_make_x_monotone<CK> (A, std::back_inserter(vec));
 
-        return res;
+//         for(unsigned i=0;i<vec.size();++i)
+//           *res++=vec.at(i).first;       
+
+//         return res;
+
+	return    make_x_monotone<CK> (A, res);
 
       }
 
@@ -334,8 +305,6 @@ namespace CircularFunctors {
     OutputIterator
     operator()(const Line_arc_2 &A, OutputIterator res) const
     { 
-//       *res++ = make_object(A);
-//       return res;
       return make_x_monotone<CK>(A,res);
     }