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

Used the traits adaptor for traits types (instead of the traits itself).

This commit is contained in:
Efi Fogel 2018-10-06 18:53:17 +03:00
parent 5afbc4985a
commit 2df88cb4de
1 changed files with 136 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2_impl.h
View File

@ -460,7 +460,7 @@ compare_y_at_end(const X_monotone_curve_2& xcv1,
{ {
CGAL_precondition(traits->is_in_x_range_2_object()(xcv1, xcv2)); CGAL_precondition(traits->is_in_x_range_2_object()(xcv1, xcv2));
typedef typename Traits::Compare_xy_2 Compare_xy_2; typedef typename Traits_adaptor_2::Compare_xy_2 Compare_xy_2;
typedef typename Traits::Compare_y_at_x_2 Compare_y_at_x_2; typedef typename Traits::Compare_y_at_x_2 Compare_y_at_x_2;
typedef typename Traits::Construct_min_vertex_2 Construct_min_vertex_2; typedef typename Traits::Construct_min_vertex_2 Construct_min_vertex_2;
typedef typename Traits::Construct_max_vertex_2 Construct_max_vertex_2; typedef typename Traits::Construct_max_vertex_2 Construct_max_vertex_2;
@ -584,7 +584,7 @@ compare_y_at_end(const X_monotone_curve_2& xcv1,
} }
// In this case we compare two normal points. // In this case we compare two normal points.
Compare_xy_2 compare_xy = traits->compare_xy_2_object(); Compare_xy_2 compare_xy = traits->compare_xy_2_object();
// Get the left endpoints of xcv1 and xcv2. // Get the left endpoints of xcv1 and xcv2.
const Point_2& left1 = const Point_2& left1 =
@ -1055,7 +1055,7 @@ _append_vertex(Envelope_diagram_1& diag,
// (or maximization) diagram. // (or maximization) diagram.
// //
template <class Traits, class Diagram> template <class Traits, class Diagram>
void Envelope_divide_and_conquer_2<Traits,Diagram>:: void Envelope_divide_and_conquer_2<Traits, Diagram>::
_merge_vertical_segments(Curve_pointer_vector& vert_vec, _merge_vertical_segments(Curve_pointer_vector& vert_vec,
Envelope_diagram_1& out_d) Envelope_diagram_1& out_d)
{ {