From a26f984913d9c3e33275a3a83dafaa8e2c9bae9f Mon Sep 17 00:00:00 2001 From: Ron Wein Date: Wed, 1 Mar 2006 07:45:16 +0000 Subject: [PATCH] Changed CGAL::sqrt(double) to std::sqrt(). --- .../CGAL/Arr_point_location/Arr_lm_grid_generator.h | 2 +- .../CGAL/Arr_point_location/Arr_lm_vertices_generator.h | 2 +- .../include/CGAL/Arr_traits_2/Circle_segment_2.h | 8 ++++---- .../include/CGAL/Arr_traits_2/Conic_x_monotone_arc_2.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Arrangement_2/include/CGAL/Arr_point_location/Arr_lm_grid_generator.h b/Arrangement_2/include/CGAL/Arr_point_location/Arr_lm_grid_generator.h index 7de4c4a2cc2..e7a105de6d4 100755 --- a/Arrangement_2/include/CGAL/Arr_point_location/Arr_lm_grid_generator.h +++ b/Arrangement_2/include/CGAL/Arr_point_location/Arr_lm_grid_generator.h @@ -270,7 +270,7 @@ protected: n= arr->number_of_vertices(); //calculate the step size - sqrt_n = static_cast (CGAL::sqrt(static_cast (n)) + 0.99999); + sqrt_n = static_cast (std::sqrt(static_cast (n)) + 0.99999); FT delta_x = right.x() - left.x(); FT delta_y = top.y() - bottom.y(); step_x = delta_x / (sqrt_n-1); diff --git a/Arrangement_2/include/CGAL/Arr_point_location/Arr_lm_vertices_generator.h b/Arrangement_2/include/CGAL/Arr_point_location/Arr_lm_vertices_generator.h index 19549afbb8f..c9daba48201 100755 --- a/Arrangement_2/include/CGAL/Arr_point_location/Arr_lm_vertices_generator.h +++ b/Arrangement_2/include/CGAL/Arr_point_location/Arr_lm_vertices_generator.h @@ -274,7 +274,7 @@ protected: double nl = static_cast (num_landmarks); const int sqrt_num_landmarks = - static_cast (CGAL::sqrt(nl) + 0.5); + static_cast (std::sqrt (nl) + 0.5); num_small_not_updated_changes++; if ((num_landmarks < 10) || diff --git a/Arrangement_2/include/CGAL/Arr_traits_2/Circle_segment_2.h b/Arrangement_2/include/CGAL/Arr_traits_2/Circle_segment_2.h index f326a489d5d..cb6839f5880 100644 --- a/Arrangement_2/include/CGAL/Arr_traits_2/Circle_segment_2.h +++ b/Arrangement_2/include/CGAL/Arr_traits_2/Circle_segment_2.h @@ -1330,12 +1330,12 @@ public: if(_is_upper()) { y_max = to_double(circ.center().y())+ - CGAL::sqrt(to_double(circ.squared_radius())); + std::sqrt(to_double(circ.squared_radius())); } else { y_min = to_double(circ.center().y()) - - CGAL::sqrt(to_double(circ.squared_radius())); + std::sqrt(to_double(circ.squared_radius())); } } @@ -2396,9 +2396,9 @@ protected: disc = app_sqr_rad - CGAL::square(x - app_xcenter); CGAL_precondition(disc >= 0); if(is_up) - y = app_ycenter + CGAL::sqrt(disc); + y = app_ycenter + std::sqrt(disc); else - y = app_ycenter - CGAL::sqrt(disc); + y = app_ycenter - std::sqrt(disc); *oi = std::make_pair(x, y); ++oi; diff --git a/Arrangement_2/include/CGAL/Arr_traits_2/Conic_x_monotone_arc_2.h b/Arrangement_2/include/CGAL/Arr_traits_2/Conic_x_monotone_arc_2.h index b34e0efad3f..264409c962a 100644 --- a/Arrangement_2/include/CGAL/Arr_traits_2/Conic_x_monotone_arc_2.h +++ b/Arrangement_2/include/CGAL/Arr_traits_2/Conic_x_monotone_arc_2.h @@ -633,11 +633,11 @@ public: // based on the information flags. if ((this->_info & PLUS_SQRT_DISC_ROOT) != 0) { - y = (::sqrt(disc) - B) / (2*A); + y = (std::sqrt(disc) - B) / (2*A); } else { - y = -(B + ::sqrt (disc)) / (2*A); + y = -(B + std::sqrt (disc)) / (2*A); } }