songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace calls to CGAL::solve() by AK().solve_object()() (needed by recent g++).

This commit is contained in:
Sylvain Pion 2005-12-17 23:13:50 +00:00
parent ee17a0a2e4
commit afa39ebf5e
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Packages/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circle_2.h
View File

@ -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/global_functions_on_roots_and_polynomials_2_2.h>
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<CK>(c1);
Equation e2 = get_equation<CK>(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<typename CK::Algebraic_kernel>
( 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;

13
Packages/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_2.h
View File

@ -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<CK>(l);
Equation_circle e2 = CGAL::get_equation<CK>(c);
@ -64,9 +65,9 @@ namespace LinearFunctors {
unsigned > >
solutions_container;
solutions_container solutions;
CGAL::solve<typename CK::Algebraic_kernel>
( 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();