From 0a76cd42f780fcec7d2cae673301504a3c91538c Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Mon, 28 Jul 2008 16:07:28 +0000 Subject: [PATCH] Remove the deprecated linear kernel functors Construct_supporting_line_2 and Construct_supporting_line_3. (they were deprecated in 2004). --- Installation/CHANGES | 2 + .../include/CGAL/Kernel/function_objects.h | 38 ------------------- .../include/CGAL/Kernel/interface_macros.h | 6 --- .../test/Kernel_23/include/CGAL/_test_new_2.h | 8 ---- .../test/Kernel_23/include/CGAL/_test_new_3.h | 8 ---- 5 files changed, 2 insertions(+), 60 deletions(-) diff --git a/Installation/CHANGES b/Installation/CHANGES index 10f9cac6934..5cb77d1bbeb 100644 --- a/Installation/CHANGES +++ b/Installation/CHANGES @@ -19,6 +19,8 @@ CMake now replaces install_cgal... 3- Kernels - The Kernel archetypes provided by the 2D/3D linear kernel have been removed. +- The deprecated linear kernel functors Construct_supporting_line_2 and + Construct_supporting_line_3 have been removed. - Ambiant_dimension and Feature_dimenison have been added to retrieve the potentially compile-time dimension of a space or of an object. - barycenter() functions have been added. diff --git a/Kernel_23/include/CGAL/Kernel/function_objects.h b/Kernel_23/include/CGAL/Kernel/function_objects.h index b0ad3543aeb..302c8dc98b9 100644 --- a/Kernel_23/include/CGAL/Kernel/function_objects.h +++ b/Kernel_23/include/CGAL/Kernel/function_objects.h @@ -1608,44 +1608,6 @@ namespace CommonKernelFunctors { { return this->operator()(Return_base_tag(), center, orientation); } }; -#ifndef CGAL_NO_DEPRECATED_CODE - template - class Construct_supporting_line_2 - { - typedef typename K::Line_2 Line_2; - typedef typename K::Ray_2 Ray_2; - typedef typename K::Segment_2 Segment_2; - public: - typedef Line_2 result_type; - - Line_2 - operator()( const Ray_2& r) const - { return r.supporting_line(); } - - Line_2 - operator()( const Segment_2& s) const - { return s.supporting_line(); } - }; - - template - class Construct_supporting_line_3 - { - typedef typename K::Line_3 Line_3; - typedef typename K::Ray_3 Ray_3; - typedef typename K::Segment_3 Segment_3; - public: - typedef Line_3 result_type; - - Line_3 - operator()( const Ray_3& r) const - { return r.rep().supporting_line(); } - - Line_3 - operator()( const Segment_3& s) const - { return s.supporting_line(); } - }; -#endif // CGAL_NO_DEPRECATED_CODE - template class Construct_supporting_plane_3 { diff --git a/Kernel_23/include/CGAL/Kernel/interface_macros.h b/Kernel_23/include/CGAL/Kernel/interface_macros.h index aed43e4970e..1510c60cd9c 100644 --- a/Kernel_23/include/CGAL/Kernel/interface_macros.h +++ b/Kernel_23/include/CGAL/Kernel/interface_macros.h @@ -403,12 +403,6 @@ CGAL_Kernel_cons(Construct_source_3, construct_source_3_object) CGAL_Kernel_cons(Construct_sphere_3, construct_sphere_3_object) -#ifndef CGAL_NO_DEPRECATED_CODE -CGAL_Kernel_cons(Construct_supporting_line_2, - construct_supporting_line_2_object) -CGAL_Kernel_cons(Construct_supporting_line_3, - construct_supporting_line_3_object) -#endif // CGAL_NO_DEPRECATED_CODE CGAL_Kernel_cons(Construct_supporting_plane_3, construct_supporting_plane_3_object) CGAL_Kernel_cons(Construct_target_2, diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_new_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_new_2.h index beda1b36278..ba9ec63da03 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_new_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_new_2.h @@ -251,14 +251,6 @@ test_new_2(const R& rep) cccit = construct_cartesian_const_iterator_2(v6); cccit = construct_cartesian_const_iterator_2(v6,0); -#ifndef CGAL_NO_DEPRECATED_CODE - typename R::Construct_supporting_line_2 construct_supporting_line - = rep.construct_supporting_line_2_object(); - Line_2 tmp8a = construct_supporting_line(r2); - Line_2 tmp8b = construct_supporting_line(s2); - use(tmp8a); use(tmp8b); -#endif // CGAL_NO_DEPRECATED_CODE - typename R::Construct_perpendicular_vector_2 construct_perpendicular_vector = rep.construct_perpendicular_vector_2_object(); Vector_2 tmp9 = construct_perpendicular_vector(v2,CLOCKWISE); diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_new_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_new_3.h index b26deae65cd..f2a928b7fd9 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_new_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_new_3.h @@ -302,14 +302,6 @@ test_new_3(const R& rep) cccit = construct_cartesian_const_iterator_3(v5); cccit = construct_cartesian_const_iterator_3(v5,0); -#ifndef CGAL_NO_DEPRECATED_CODE - typename R::Construct_supporting_line_3 construct_supporting_line - = rep.construct_supporting_line_3_object(); - Line_3 tmp8a = construct_supporting_line(r2); - Line_3 tmp8b = construct_supporting_line(s2); - use(tmp8a); use(tmp8b); -#endif // CGAL_NO_DEPRECATED_CODE - typename R::Construct_perpendicular_plane_3 construct_perpendicular_plane = rep.construct_perpendicular_plane_3_object(); Plane_3 tmp3 = construct_perpendicular_plane(l2,p2);