From 27e6ca3fe441ee338244094da49ab37e1364ab15 Mon Sep 17 00:00:00 2001 From: Efi Fogel Date: Wed, 21 Nov 2007 10:24:59 +0000 Subject: [PATCH] API revisited --- .../Envelope_2/Env_divide_and_conquer_2_impl.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2_impl.h b/Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2_impl.h index fec147bb477..ed952536ffa 100644 --- a/Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2_impl.h +++ b/Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2_impl.h @@ -131,9 +131,9 @@ _construct_singleton_diagram (const X_monotone_curve_2& cv, CGAL_assertion (out_d.leftmost()->is_empty()); // Check if the given curve is bounded from the left and from the right. - if (traits->boundary_in_x_2_object() (cv, MIN_END) != NO_BOUNDARY) + if (traits->boundary_in_x_2_object() (cv, ARR_MIN_END) != NO_BOUNDARY) { - if (traits->boundary_in_x_2_object() (cv, MAX_END) != NO_BOUNDARY) + if (traits->boundary_in_x_2_object() (cv, ARR_MAX_END) != NO_BOUNDARY) { // The curve is defined over (-oo, oo), so its diagram contains // only a single edge. @@ -145,7 +145,7 @@ _construct_singleton_diagram (const X_monotone_curve_2& cv, // The curve is defined over (-oo, x], where x is finite. // Create a vertex and associate it with the right endpoint of cv. CGAL_precondition - (traits->boundary_in_y_2_object() (cv, MAX_END) == NO_BOUNDARY); + (traits->boundary_in_y_2_object() (cv, ARR_MAX_END) == NO_BOUNDARY); Vertex_handle v = out_d.new_vertex (traits->construct_max_vertex_2_object() (cv)); @@ -165,12 +165,12 @@ _construct_singleton_diagram (const X_monotone_curve_2& cv, return; } - if (traits->boundary_in_x_2_object() (cv, MAX_END) != NO_BOUNDARY) + if (traits->boundary_in_x_2_object() (cv, ARR_MAX_END) != NO_BOUNDARY) { // The curve is defined over [x, +oo), where x is finite. // Create a vertex and associate it with the left endpoint of cv. CGAL_precondition - (traits->boundary_in_y_2_object() (cv, MIN_END) == NO_BOUNDARY); + (traits->boundary_in_y_2_object() (cv, ARR_MIN_END) == NO_BOUNDARY); Vertex_handle v = out_d.new_vertex (traits->construct_min_vertex_2_object() (cv)); @@ -197,9 +197,9 @@ _construct_singleton_diagram (const X_monotone_curve_2& cv, // -oo -------------(+)============(+)------------ +oo // CGAL_precondition - (traits->boundary_in_y_2_object() (cv, MIN_END) == NO_BOUNDARY); + (traits->boundary_in_y_2_object() (cv, ARR_MIN_END) == NO_BOUNDARY); CGAL_precondition - (traits->boundary_in_y_2_object() (cv, MAX_END) == NO_BOUNDARY); + (traits->boundary_in_y_2_object() (cv, ARR_MAX_END) == NO_BOUNDARY); Vertex_handle v1 = out_d.new_vertex (traits->construct_min_vertex_2_object() (cv)); @@ -618,9 +618,9 @@ _merge_two_intervals (Edge_const_handle e1, bool is_leftmost1, // Get the endpoints of the overlapping curves. const bool has_left = - (traits->boundary_in_x_2_object() (icv, MIN_END) == NO_BOUNDARY); + (traits->boundary_in_x_2_object() (icv, ARR_MIN_END) == NO_BOUNDARY); const bool has_right = - (traits->boundary_in_x_2_object() (icv, MAX_END) == NO_BOUNDARY); + (traits->boundary_in_x_2_object() (icv, ARR_MAX_END) == NO_BOUNDARY); Point_2 p1, p2; if (has_left)