From a12ae8cdc84d321b735e40b42c751b83701acaf2 Mon Sep 17 00:00:00 2001 From: Monique Teillaud Date: Tue, 7 Mar 2006 16:41:44 +0000 Subject: [PATCH] fixed Arity --- ...ion_objects_on_roots_and_polynomials_2_2.h | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/Algebraic_kernel/include/CGAL/Algebraic_kernel/function_objects_on_roots_and_polynomials_2_2.h b/Algebraic_kernel/include/CGAL/Algebraic_kernel/function_objects_on_roots_and_polynomials_2_2.h index 424b0439b8d..f8912c00f4d 100644 --- a/Algebraic_kernel/include/CGAL/Algebraic_kernel/function_objects_on_roots_and_polynomials_2_2.h +++ b/Algebraic_kernel/include/CGAL/Algebraic_kernel/function_objects_on_roots_and_polynomials_2_2.h @@ -40,7 +40,8 @@ namespace AlgebraicFunctors { typedef typename AK::Polynomial_1_2 Equation_Line; public: - typedef void result_type; + typedef void result_type; + typedef Arity_tag<3> Arity; template < class OutputIterator > OutputIterator @@ -82,6 +83,7 @@ namespace AlgebraicFunctors { public: typedef Polynomial_for_circles_2_2 result_type; + typedef Arity_tag<3> Arity; result_type operator()(const RT& xc, const RT& yc, const RT& r_sq) const @@ -98,6 +100,7 @@ namespace AlgebraicFunctors { public: typedef Polynomial_1_2 result_type; + typedef Arity_tag<3> Arity; result_type operator()( const RT& a, const RT& b, const RT& c) const @@ -113,7 +116,8 @@ namespace AlgebraicFunctors { typedef typename AK::Root_for_circles_2_2 Root_for_circles_2_2; public: - typedef CGAL::Sign result_type; + typedef CGAL::Sign result_type; + typedef Arity_tag<2> Arity; result_type operator()( const Polynomial_for_circles_2_2 & equation, @@ -134,8 +138,9 @@ namespace AlgebraicFunctors { typedef typename AK::Polynomial_for_circles_2_2 Polynomial_for_circles_2_2; public: - typedef void result_type; - + typedef void result_type; + typedef Arity_tag<2> Arity; + Root_for_circles_2_2 operator()(const Polynomial_for_circles_2_2 & c, bool i) const @@ -156,8 +161,9 @@ namespace AlgebraicFunctors { typedef typename AK::Polynomial_for_circles_2_2 Polynomial_for_circles_2_2; public: - typedef void result_type; - + typedef void result_type; + typedef Arity_tag<2> Arity; + Root_for_circles_2_2 operator()(const Polynomial_for_circles_2_2 & c, bool i) const @@ -174,11 +180,12 @@ namespace AlgebraicFunctors { template < class AK > class Compare_x { - public: typedef typename AK::Root_for_circles_2_2 Root_for_circles_2_2; typedef typename AK::RT RT; + public: typedef CGAL::Comparison_result result_type; + typedef Arity_tag<2> Arity; result_type operator()(const Root_for_circles_2_2& r1, @@ -190,11 +197,12 @@ namespace AlgebraicFunctors { template < class AK > class Compare_y { - public: typedef typename AK::Root_for_circles_2_2 Root_for_circles_2_2; typedef typename AK::RT RT; - + + public: typedef CGAL::Comparison_result result_type; + typedef Arity_tag<2> Arity; result_type operator()(const Root_for_circles_2_2& r1, @@ -206,11 +214,12 @@ namespace AlgebraicFunctors { template < class AK > class Compare_xy { - public: typedef typename AK::Root_for_circles_2_2 Root_for_circles_2_2; typedef typename AK::RT RT; + public: typedef CGAL::Comparison_result result_type; + typedef Arity_tag<2> Arity; result_type operator()(const Root_for_circles_2_2& r1,