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

sending to trash some unfortunate global functions

This commit is contained in:
Pedro Machado Manhaes de Castro 2008-09-30 13:36:33 +00:00
parent 1bfd02a7f2
commit d7e7e23c1a
8 changed files with 19 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Circular_kernel_2/include/CGAL/Circular_kernel_2.h
View File

@ -36,12 +36,11 @@
#include <CGAL/Circular_kernel_2/function_objects_polynomial_circular.h>
#include <CGAL/global_functions_on_circular_arcs_2.h>
#include <CGAL/global_functions_on_line_arcs_2.h>
#include <CGAL/Circular_kernel_2/function_objects_on_line_2.h>
#include <CGAL/global_functions_on_line_2.h>
#include <CGAL/Circular_kernel_2/function_objects_on_circle_2.h>
#include <CGAL/global_functions_on_circle_2.h>
CGAL_BEGIN_NAMESPACE

1
Circular_kernel_2/include/CGAL/Circular_kernel_2/Circular_arc_point_2.h
View File

@ -29,7 +29,6 @@
#include <CGAL/Bbox_2.h>
#include <CGAL/Interval_nt.h>
#include <boost/type_traits/is_same.hpp>
#include <CGAL/global_functions_on_circle_2.h>
namespace CGAL {
namespace CGALi {

2
Circular_kernel_2/include/CGAL/Circular_kernel_2/Line_arc_2.h
View File

@ -25,8 +25,6 @@
#ifndef CGAL_CIRCULAR_KERNEL_LINE_ARC_2_H
#define CGAL_CIRCULAR_KERNEL_LINE_ARC_2_H
#include <CGAL/global_functions_on_line_2.h>
#include <CGAL/global_functions_on_circle_2.h>
#include <CGAL/global_functions_on_line_arcs_2.h>
#include <CGAL/intersections.h>
#include <CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomial_1_2_and_2_2.h>

4
Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_2.h
View File

@ -83,8 +83,8 @@ namespace LinearFunctors {
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 = CGAL::get_equation<CK>(l);
Equation_circle e2 = CGAL::get_equation<CK>(c);
Equation_line e1 = CK().get_equation_object()(l);
Equation_circle e2 = CK().get_equation_object()(c);
typedef std::vector< std::pair < Root_for_circles_2_2, unsigned > >
solutions_container;

14
Circular_kernel_2/include/CGAL/Simple_circular_kernel_2.h
View File

@ -25,20 +25,22 @@
#ifndef CGAL_SIMPLE_CIRCULAR_KERNEL_2_H
#define CGAL_SIMPLE_CIRCULAR_KERNEL_2_H
#include <CGAL/Circular_kernel_2/Circular_arc_point_2.h>
#include <CGAL/Circular_kernel_2/Circular_arc_2.h>
#include <CGAL/Circular_kernel_2/Line_arc_2.h>
#include <CGAL/Circular_arc_2.h>
#include <CGAL/Circular_arc_point_2.h>
#include <CGAL/Line_arc_2.h>
#include <CGAL/Circular_kernel_2/Circular_arc_point_2.h>
#include <CGAL/Circular_kernel_2/Circular_arc_2.h>
#include <CGAL/Circular_kernel_2/Line_arc_2.h>
#include <CGAL/Circular_kernel_2/function_objects_on_circle_2.h>
#include <CGAL/global_functions_on_circle_2.h>
#include <CGAL/Circular_kernel_type_equality_wrapper.h>
#include <CGAL/Circular_kernel_2/function_objects_polynomial_circular.h>
#include <CGAL/global_functions_on_circular_arcs_2.h>
#include <CGAL/global_functions_on_line_arcs_2.h>
#include <CGAL/Circular_kernel_type_equality_wrapper.h>
#include <CGAL/Circular_kernel_2/function_objects_on_line_2.h>
#include <CGAL/Circular_kernel_2/function_objects_on_circle_2.h>
CGAL_BEGIN_NAMESPACE

24
Circular_kernel_2/include/CGAL/global_functions_on_circle_2.h
View File

@ -27,30 +27,6 @@
CGAL_BEGIN_NAMESPACE
template< class CK >
inline
typename CK::Polynomial_for_circles_2_2
get_equation(const Circle_2<CK> & c)
{
return CK().get_equation_object()(c);
}
template< class CK >
inline
Circle_2<CK>
construct_circle(const typename CK::Polynomial_for_circles_2_2 & eq)
{
return CK().construct_circle_2_object()(eq);
}
template< class CK >
inline
bool
has_on(const Circle_2<CK> &c, const Circular_arc_point_2<CK> &p)
{
return CK().has_on_2_object()(c, p);
}
CGAL_END_NAMESPACE
#endif // CGAL_CIRCULAR_KERNEL_GLOBAL_FUNCTIONS_ON_CIRCLE_2_H

8
Circular_kernel_2/include/CGAL/global_functions_on_circular_arcs_2.h
View File

@ -156,6 +156,14 @@ make_xy_monotone(const Circular_arc_2<CK> &A, OutputIterator it)
return CK().make_xy_monotone_2_object()(A, it);
}
template< class CK >
inline
bool
has_on(const Circle_2<CK> &c, const Circular_arc_point_2<CK> &p)
{
return CK().has_on_2_object()(c, p);
}
CGAL_END_NAMESPACE
#endif // CGAL_CIRCULAR_KERNEL_GLOBAL_FUNCTIONS_ON_CIRCULAR_ARCS_2_H

15
Circular_kernel_2/include/CGAL/global_functions_on_line_2.h
View File

@ -27,21 +27,6 @@
CGAL_BEGIN_NAMESPACE
template< class CK >
inline
typename CK::Polynomial_1_2
get_equation(const Line_2<CK> & l)
{
return CK().get_equation_object()(l);
}
template< class CK >
inline
CGAL::Line_2<CK>
construct_line(const typename CK::Polynomial_1_2 & eq)
{
return CK().construct_line_2_object()(eq);
}
CGAL_END_NAMESPACE