Skip to content

Commit

Permalink
Misc post-merge fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@MaelRL
MaelRL committed Jan 17, 2025
1 parent 3b7a4ed commit 06f862e
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 23 deletions.
4 changes: 2 additions & 2 deletions Filtered_kernel/examples/Filtered_kernel/Filtered_predicate.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 0 additions & 2 deletions .../include/CGAL/Filtered_kernel/internal/Static_filters/Coplanar_side_of_bounded_circle_3.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
18 changes: 9 additions & 9 deletions ...lude/CGAL/Filtered_kernel/internal/Static_filters/Power_side_of_oriented_power_circle_2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 );
Expand Down Expand Up @@ -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
{
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -265,11 +265,11 @@ namespace CGAL { namespace internal { namespace Static_filters_predicates {
}
}
}
return static_cast<result_type>(cmpx * int_tmp_result);
return static_cast<Oriented_side>(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;
Expand Down Expand Up @@ -314,7 +314,7 @@ namespace CGAL { namespace internal { namespace Static_filters_predicates {
}
}
}
return static_cast<result_type>(cmpy * int_tmp_result_FFWKCAA);
return static_cast<Oriented_side>(cmpy * int_tmp_result_FFWKCAA);

}
else
Expand Down
4 changes: 1 addition & 3 deletions Filtered_kernel/include/CGAL/Kernel_profiler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<const P&>(*this)).name())
Expand All @@ -35,7 +33,7 @@ struct Primitive_profiler
: P(p) {}

template <class ... A>
result_type
decltype(auto)
operator()(A&& ... a) const
{
CGAL_KERNEL_PROFILER;
Expand Down
1 change: 0 additions & 1 deletion Intersections_3/include/CGAL/Intersections_3/internal/Line_3_Tetrahedron_3_intersection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ struct Tetrahedron_Line_intersection_3
: public Tetrahedron_lines_intersection_3_base<K, typename K::Line_3, Tetrahedron_Line_intersection_3<K> >
{
typedef Tetrahedron_lines_intersection_3_base<K, typename K::Line_3, Tetrahedron_Line_intersection_3<K> > Base;
typedef typename Base::Result_type Result_type;

Tetrahedron_Line_intersection_3(const typename K::Tetrahedron_3& tet,
const typename K::Line_3& l)
Expand Down
13 changes: 7 additions & 6 deletions Kernel_23/include/CGAL/Kernel/function_objects.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -2216,11 +2216,12 @@ namespace CommonKernelFunctors {
template <typename K>
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
{
Expand Down
2 changes: 2 additions & 0 deletions NewKernel_d/include/CGAL/NewKernel_d/Cartesian_static_filters.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ template <class Base_,class R_> struct Side_of_oriented_sphere_2 : private Store
};

template <class Base_,class R_> struct Adapter_3 {
typedef typename Get_type<R_, Orientation_tag>::type Orientation;
typedef typename Get_type<R_, Oriented_side_tag>::type Oriented_side;
typedef typename Get_type<R_, Point_tag>::type Point;
typedef typename Get_functor<R_, Compute_point_cartesian_coordinate_tag>::type CC;
typedef typename Get_functor<Base_, Orientation_of_points_tag>::type Orientation_base;
Expand Down

0 comments on commit 06f862e

Please sign in to comment.