From e8a393dcd2b82fb5745efa6ba8be271e54ec55ef Mon Sep 17 00:00:00 2001 From: Michael Hemmer Date: Fri, 15 Dec 2006 12:31:11 +0000 Subject: [PATCH] rm function make_root_of_2(const NT &a, int b_, const NT &c) use: make_root_of_2(const NT &a, const NT& b_, const NT &c) --- .../Circular_kernel_3/internal_functions_on_sphere_3.h | 8 ++++---- Number_types/include/CGAL/Root_of_traits.h | 10 ---------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h b/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h index 4d957bcef10..948fdb0e9aa 100644 --- a/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h +++ b/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h @@ -17,8 +17,8 @@ // and a STREP (FET Open) Project under Contract No IST-006413 // (ACS -- Algorithms for Complex Shapes) // -// $URL: $ -// $Id: $ +// $URL$ +// $Id$ // // Author(s) : Monique Teillaud // Sylvain Pion @@ -289,9 +289,9 @@ namespace CGAL { CGAL::square(dz); const FT sq_r1r2 = s1.squared_radius()*s2.squared_radius(); const FT sq_r1_p_sq_r2 = s1.squared_radius() + s2.squared_radius(); - Root_of_2 left_1 = make_root_of_2(d2,-2,sq_r1r2); + Root_of_2 left_1 = make_root_of_2(d2,FT(-2),sq_r1r2); if(left_1 > sq_r1_p_sq_r2) return false; - Root_of_2 left_2 = make_root_of_2(d2,2,sq_r1r2); + Root_of_2 left_2 = make_root_of_2(d2,FT(2),sq_r1r2); if(left_2 < sq_r1_p_sq_r2) return false; return true; } diff --git a/Number_types/include/CGAL/Root_of_traits.h b/Number_types/include/CGAL/Root_of_traits.h index e8709e047d5..f594d6dd9a5 100644 --- a/Number_types/include/CGAL/Root_of_traits.h +++ b/Number_types/include/CGAL/Root_of_traits.h @@ -162,16 +162,6 @@ make_root_of_2(const NT &a, const NT &b, const NT &c,const bool smaller) return make_root_of_2(a,b,c,smaller); } -template < class NT > -inline -typename Root_of_traits< NT >::Root_of_2 -make_root_of_2(const NT &a, int b_, const NT &c) -{ - NT b(b_); - typename Root_of_traits::Make_root_of_2 make_root_of_2; - return make_root_of_2(a,b,c); -} - CGAL_END_NAMESPACE #endif // CGAL_ROOT_OF_TRAITS_H