From d8f8af7e14c0042b3555e2bc0643b0472b4e6933 Mon Sep 17 00:00:00 2001
From: Pedro Machado Manhaes de Castro <Pedro.Machado@sophia.inria.fr>
Date: Thu, 18 Sep 2008 18:53:33 +0000
Subject: [PATCH] putting both Get_equation together in
 function_objects_polynomial

---
 .../function_objects_on_circle_2.h            | 16 ----------------
 .../function_objects_on_line_2.h              | 14 --------------
 .../function_objects_polynomial_circular.h    | 19 +++++++++++++++++++
 3 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/function_objects_on_circle_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/function_objects_on_circle_2.h
index 2387a4d45ba..edbb44cc221 100644
--- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/function_objects_on_circle_2.h
+++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/function_objects_on_circle_2.h
@@ -60,22 +60,6 @@ namespace CircularFunctors {
 
   };
 
-  template < class CK >
-  class Get_equation : public LinearFunctors::Get_equation<CK>
-  {
-    public:
-
-    typedef typename CK::Polynomial_for_circles_2_2 result_type;
-
-    using LinearFunctors::Get_equation<CK>::operator();
-
-    result_type
-    operator() ( const typename CK::Circle_2 & c )
-      {
-	return CircularFunctors::get_equation<CK>(c);
-      }
-  };
-
 } // namespace CircularFunctors
 
 template < typename K >
diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/function_objects_on_line_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/function_objects_on_line_2.h
index b12e5678158..b8522c5e2a4 100644
--- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/function_objects_on_line_2.h
+++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/function_objects_on_line_2.h
@@ -57,20 +57,6 @@ namespace LinearFunctors {
       }
   };
 
-  template < class CK >
-  class Get_equation
-  {
-    public:
-
-    typedef typename CK::Polynomial_1_2 result_type;
-
-    result_type
-    operator() ( const typename CK::Line_2 & l )
-      {
-	return LinearFunctors::get_equation<CK>(l);
-      }
-  };
-
 } // namespace LinearFunctors
 
 template < typename K >
diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/function_objects_polynomial_circular.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/function_objects_polynomial_circular.h
index c1e32f646c3..d1ca196c279 100644
--- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/function_objects_polynomial_circular.h
+++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/function_objects_polynomial_circular.h
@@ -647,6 +647,25 @@ template < class CK >
 
   };
 
+  template < class CK >
+  class Get_equation
+  {
+    public:
+
+    typedef void result_type;
+
+    typename CK::Polynomial_1_2
+    operator() ( const typename CK::Line_2 & l )
+      {
+	      return LinearFunctors::get_equation<CK>(l);
+      }
+
+    typename CK::Polynomial_for_circles_2_2
+    operator() ( const typename CK::Circle_2 & c )
+      {
+        return CircularFunctors::get_equation<CK>(c);
+		  }		
+  };
 
   template < class CK >
   class Split_2