From afa39ebf5e0fb1e935883449d57acaa3db3ebe59 Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Sat, 17 Dec 2005 23:13:50 +0000 Subject: [PATCH] Replace calls to CGAL::solve() by AK().solve_object()() (needed by recent g++). --- .../Curved_kernel/internal_functions_on_circle_2.h | 11 ++++++----- .../Curved_kernel/internal_functions_on_line_2.h | 13 +++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Packages/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circle_2.h b/Packages/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circle_2.h index e5d4fb6ae1b..a7635a5a243 100644 --- a/Packages/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circle_2.h +++ b/Packages/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circle_2.h @@ -12,6 +12,7 @@ #ifndef CGAL_CURVED_KERNEL_INTERNAL_FUNCTIONS_ON_CIRCLE_2_H #define CGAL_CURVED_KERNEL_INTERNAL_FUNCTIONS_ON_CIRCLE_2_H + #include CGAL_BEGIN_NAMESPACE @@ -76,8 +77,9 @@ namespace CircularFunctors { const typename CK::Circle_2 & c2, OutputIterator res ) { - typedef typename CK::Polynomial_for_circles_2_2 Equation; - typedef typename CK::Root_for_circles_2_2 Root_for_circles_2_2; + typedef typename CK::Algebraic_kernel AK; + typedef typename CK::Polynomial_for_circles_2_2 Equation; + typedef typename CK::Root_for_circles_2_2 Root_for_circles_2_2; Equation e1 = get_equation(c1); Equation e2 = get_equation(c2); @@ -89,9 +91,8 @@ namespace CircularFunctors { typedef std::vector< std::pair < Root_for_circles_2_2, unsigned > > solutions_container; solutions_container solutions; - - CGAL::solve - ( e1,e2, std::back_inserter(solutions) ); // to be optimized + + AK().solve_object()(e1, e2, std::back_inserter(solutions)); // to be optimized typedef typename CK::Circular_arc_point_2 Circular_arc_point_2; diff --git a/Packages/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_2.h b/Packages/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_2.h index 73ab2749919..ca1a2e896e8 100644 --- a/Packages/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_2.h +++ b/Packages/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_2.h @@ -51,9 +51,10 @@ namespace LinearFunctors { const typename CK::Circle_2 & c, OutputIterator res ) { - typedef typename CK::Polynomial_1_2 Equation_line; - typedef typename CK::Polynomial_for_circles_2_2 Equation_circle; - typedef typename CK::Root_for_circles_2_2 Root_for_circles_2_2; + typedef typename CK::Algebraic_kernel AK; + typedef typename CK::Polynomial_1_2 Equation_line; + typedef typename CK::Polynomial_for_circles_2_2 Equation_circle; + typedef typename CK::Root_for_circles_2_2 Root_for_circles_2_2; Equation_line e1 = get_equation(l); Equation_circle e2 = CGAL::get_equation(c); @@ -64,9 +65,9 @@ namespace LinearFunctors { unsigned > > solutions_container; solutions_container solutions; - CGAL::solve - ( e1,e2, std::back_inserter(solutions) ); // to be optimized - + + AK().solve_object()(e1, e2, std::back_inserter(solutions)); // to be optimized + typedef typename CK::Circular_arc_point_2 Circular_arc_point_2; for ( typename solutions_container::iterator it = solutions.begin();