From 596f3e3013c100e7ca33bbb91bfbe2510fe2cb61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Fri, 12 Mar 2021 14:34:36 +0100 Subject: [PATCH] Fix namespaces --- .../include/CGAL/Cartesian/function_objects.h | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h b/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h index bc8b47e102e..9657a137946 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h @@ -480,15 +480,15 @@ namespace CartesianKernelFunctors { { Vector_3 diff = construct_vector(seg1.source(), pt); Vector_3 segvec = construct_vector(seg1.source(), seg1.target()); - RT d = wdot(diff,segvec, k); + RT d = CGAL::internal::wdot(diff,segvec, k); if (d <= (RT)0){ d1 = (FT(diff*diff)); }else{ - RT e = wdot(segvec,segvec, k); + RT e = CGAL::internal::wdot(segvec,segvec, k); if (d > e){ - d1 = squared_distance(pt, seg1.target(), k); + d1 = CGAL::internal::squared_distance(pt, seg1.target(), k); } else{ - Vector_3 wcr = wcross(segvec, diff, k); + Vector_3 wcr = CGAL::internal::wcross(segvec, diff, k); d1 = FT(wcr*wcr); e1 = e; } @@ -498,15 +498,15 @@ namespace CartesianKernelFunctors { { Vector_3 diff = construct_vector(seg2.source(), pt); Vector_3 segvec = construct_vector(seg2.source(), seg2.target()); - RT d = wdot(diff,segvec, k); + RT d = CGAL::internal::wdot(diff,segvec, k); if (d <= (RT)0){ d2 = (FT(diff*diff)); }else{ - RT e = wdot(segvec,segvec, k); + RT e = CGAL::internal::wdot(segvec,segvec, k); if (d > e){ - d2 = squared_distance(pt, seg2.target(), k); + d2 = CGAL::internal::squared_distance(pt, seg2.target(), k); } else{ - Vector_3 wcr = wcross(segvec, diff, k); + Vector_3 wcr = CGAL::internal::wcross(segvec, diff, k); d2 = FT(wcr*wcr); e2 = e; } @@ -531,20 +531,20 @@ namespace CartesianKernelFunctors { RT e2 = RT(1); // assert that the segment is valid (non zero length). - FT d1 = squared_distance(pt, pt2, k); + FT d1 = CGAL::internal::squared_distance(pt, pt2, k); FT d2 = FT(0); { Vector_3 diff = construct_vector(seg.source(), pt); Vector_3 segvec = construct_vector(seg.source(), seg.target()); - RT d = wdot(diff,segvec, k); + RT d = CGAL::internal::wdot(diff,segvec, k); if (d <= (RT)0){ d2 = (FT(diff*diff)); }else{ - RT e = wdot(segvec,segvec, k); + RT e = CGAL::internal::wdot(segvec,segvec, k); if (d > e){ - d2 = squared_distance(pt, seg.target(), k); + d2 = CGAL::internal::squared_distance(pt, seg.target(), k); } else{ - Vector_3 wcr = wcross(segvec, diff, k); + Vector_3 wcr = CGAL::internal::wcross(segvec, diff, k); d2 = FT(wcr*wcr); e2 = e; }