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

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)
This commit is contained in:
Michael Hemmer 2006-12-15 12:31:11 +00:00
parent b54e132e25
commit e8a393dcd2
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h
View File

@ -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 <Monique.Teillaud@sophia.inria.fr>
// Sylvain Pion <Sylvain.Pion@sophia.inria.fr>
@ -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;
}

10
Number_types/include/CGAL/Root_of_traits.h
View File

@ -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<NT>::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