From 06f862eee7bf8df397a93bb898c54c9ab63a433b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Fri, 17 Jan 2025 12:27:21 +0100 Subject: [PATCH] Misc post-merge fixes --- .../Filtered_kernel/Filtered_predicate.cpp | 4 ++-- .../Coplanar_side_of_bounded_circle_3.h | 2 -- .../Power_side_of_oriented_power_circle_2.h | 18 +++++++++--------- Filtered_kernel/include/CGAL/Kernel_profiler.h | 4 +--- .../Line_3_Tetrahedron_3_intersection.h | 1 - .../include/CGAL/Kernel/function_objects.h | 13 +++++++------ .../NewKernel_d/Cartesian_static_filters.h | 2 ++ 7 files changed, 21 insertions(+), 23 deletions(-) diff --git a/Filtered_kernel/examples/Filtered_kernel/Filtered_predicate.cpp b/Filtered_kernel/examples/Filtered_kernel/Filtered_predicate.cpp index c69d93421e7..dd6e63907c0 100644 --- a/Filtered_kernel/examples/Filtered_kernel/Filtered_predicate.cpp +++ b/Filtered_kernel/examples/Filtered_kernel/Filtered_predicate.cpp @@ -16,9 +16,9 @@ struct My_orientation_2 typedef typename K::RT RT; typedef typename K::Point_2 Point_2; - typedef typename K::Orientation result_type; + typedef typename K::Orientation Orientation; - result_type + Orientation operator()(const Point_2 &p, const Point_2 &q, const Point_2 &r) const { RT prx = p.x() - r.x(); diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Coplanar_side_of_bounded_circle_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Coplanar_side_of_bounded_circle_3.h index 48c96ec886c..ae9c2e36229 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Coplanar_side_of_bounded_circle_3.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Coplanar_side_of_bounded_circle_3.h @@ -44,8 +44,6 @@ class Side_of_bounded_circle_3 } public: - typedef Bounded_side result_type; - Bounded_side operator()(const Point &p, const Point &q, const Point &r, const Point &t) const { diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Power_side_of_oriented_power_circle_2.h b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Power_side_of_oriented_power_circle_2.h index f9097923bab..e7f1c195da8 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Power_side_of_oriented_power_circle_2.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/internal/Static_filters/Power_side_of_oriented_power_circle_2.h @@ -26,15 +26,15 @@ namespace CGAL { namespace internal { namespace Static_filters_predicates { class Power_side_of_oriented_power_circle_2: public K_base::Power_side_of_oriented_power_circle_2 { + typedef typename K_base::Oriented_side Oriented_side; typedef typename K_base::Weighted_point_2 Weighted_point_2; typedef typename K_base::FT FT; typedef typename K_base::Power_side_of_oriented_power_circle_2 Base; - public: - typedef typename Base::result_type result_type; + public: using Base::operator(); - result_type operator() ( const Weighted_point_2 & p, + Oriented_side operator()(const Weighted_point_2 & p, const Weighted_point_2 & q, const Weighted_point_2 & r, const Weighted_point_2 & t) const @@ -64,7 +64,7 @@ namespace CGAL { namespace internal { namespace Static_filters_predicates { double drx = (rx - tx); double dry = (ry - ty); double drz = (((square( drx ) + square( dry )) - rwt) + twt); - result_type int_tmp_result; + Oriented_side int_tmp_result; double RT_tmp_result; double eps; RT_tmp_result = CGAL::determinant( dpx, dpy, dpz, dqx, dqy, dqz, drx, dry, drz ); @@ -162,7 +162,7 @@ namespace CGAL { namespace internal { namespace Static_filters_predicates { } - result_type operator() ( const Weighted_point_2 & p, + Oriented_side operator()(const Weighted_point_2 & p, const Weighted_point_2 & q, const Weighted_point_2 & t) const { @@ -219,7 +219,7 @@ namespace CGAL { namespace internal { namespace Static_filters_predicates { double upper_bound_1; if( (cmpx != 0) ) { - result_type int_tmp_result; + Oriented_side int_tmp_result; double RT_tmp_result; RT_tmp_result = CGAL::determinant( dpx, dpz, dqx, dqz ); lower_bound_1 = max2; @@ -265,11 +265,11 @@ namespace CGAL { namespace internal { namespace Static_filters_predicates { } } } - return static_cast(cmpx * int_tmp_result); + return static_cast(cmpx * int_tmp_result); } int cmpy; cmpy = ((py > qy) ? 1 : ((py < qy) ? -1 : 0)); - result_type int_tmp_result_FFWKCAA; + Oriented_side int_tmp_result_FFWKCAA; double RT_tmp_result_k60Ocge = CGAL::determinant( dpy, dpz, dqy, dqz ); lower_bound_1 = max4; upper_bound_1 = max4; @@ -314,7 +314,7 @@ namespace CGAL { namespace internal { namespace Static_filters_predicates { } } } - return static_cast(cmpy * int_tmp_result_FFWKCAA); + return static_cast(cmpy * int_tmp_result_FFWKCAA); } else diff --git a/Filtered_kernel/include/CGAL/Kernel_profiler.h b/Filtered_kernel/include/CGAL/Kernel_profiler.h index 20611510e94..aaaa310afce 100644 --- a/Filtered_kernel/include/CGAL/Kernel_profiler.h +++ b/Filtered_kernel/include/CGAL/Kernel_profiler.h @@ -25,8 +25,6 @@ template < typename P > struct Primitive_profiler : public P { - typedef typename P::result_type result_type; - // #define CGAL_KERNEL_PROFILER CGAL_PROFILER(CGAL_PRETTY_FUNCTION); #define CGAL_KERNEL_PROFILER \ CGAL_PROFILER(typeid(static_cast(*this)).name()) @@ -35,7 +33,7 @@ struct Primitive_profiler : P(p) {} template - result_type + decltype(auto) operator()(A&& ... a) const { CGAL_KERNEL_PROFILER; diff --git a/Intersections_3/include/CGAL/Intersections_3/internal/Line_3_Tetrahedron_3_intersection.h b/Intersections_3/include/CGAL/Intersections_3/internal/Line_3_Tetrahedron_3_intersection.h index f1d8bdff1fd..706ceea7488 100644 --- a/Intersections_3/include/CGAL/Intersections_3/internal/Line_3_Tetrahedron_3_intersection.h +++ b/Intersections_3/include/CGAL/Intersections_3/internal/Line_3_Tetrahedron_3_intersection.h @@ -26,7 +26,6 @@ struct Tetrahedron_Line_intersection_3 : public Tetrahedron_lines_intersection_3_base > { typedef Tetrahedron_lines_intersection_3_base > Base; - typedef typename Base::Result_type Result_type; Tetrahedron_Line_intersection_3(const typename K::Tetrahedron_3& tet, const typename K::Line_3& l) diff --git a/Kernel_23/include/CGAL/Kernel/function_objects.h b/Kernel_23/include/CGAL/Kernel/function_objects.h index c456062d8c5..65baa5cd544 100644 --- a/Kernel_23/include/CGAL/Kernel/function_objects.h +++ b/Kernel_23/include/CGAL/Kernel/function_objects.h @@ -2148,10 +2148,10 @@ namespace CommonKernelFunctors { { typedef typename K::Plane_3 Plane; typedef typename K::Point_3 Point; + typename K::Construct_plane_3 construct_plane; - public: - typedef Point result_type; + public: Point operator()(const Point& p1, const Point& q1, const Point& r1, const Point& p2, const Point& q2, const Point& r2, @@ -2184,10 +2184,10 @@ namespace CommonKernelFunctors { { typedef typename K::Segment_3 Segment; typedef typename K::Point_3 Point; + typename K::Construct_segment_3 construct_segment; - public: - typedef Point result_type; + public: Point operator()(const Point& p1, const Point& q1, const Point& p2, const Point& q2) const @@ -2216,11 +2216,12 @@ namespace CommonKernelFunctors { template class Compute_alpha_for_coplanar_triangle_intersection_3 { + typedef typename K::FT FT; typedef typename K::Point_3 Point_3; typedef typename K::Vector_3 Vector_3; + public: - typedef typename K::FT result_type; - result_type + FT operator()(const Point_3& p1, const Point_3& p2, // segment 1 const Point_3& p3, const Point_3& p4) const // segment 2 { diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_static_filters.h b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_static_filters.h index 8dba5e40912..cd870c938e6 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_static_filters.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Cartesian_static_filters.h @@ -86,6 +86,8 @@ template struct Side_of_oriented_sphere_2 : private Store }; template struct Adapter_3 { + typedef typename Get_type::type Orientation; + typedef typename Get_type::type Oriented_side; typedef typename Get_type::type Point; typedef typename Get_functor::type CC; typedef typename Get_functor::type Orientation_base;