From ad0b9762329f37985d142bcb416d9f58426281f3 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Mon, 1 Mar 2010 07:50:27 +0000 Subject: [PATCH] restructure to avoid warning --- .../Envelope_2/Env_divide_and_conquer_2_impl.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 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 447b4e896e3..7ab1e0970e1 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 @@ -435,15 +435,13 @@ _merge_single_interval (Edge_const_handle e, Edge_const_handle other_edge, { new_v = _append_vertex (out_d, v->point(), e); new_v->add_curves (v->curves_begin(), v->curves_end()); + + if (res == EQUAL) + { + // In case of equality, append e's curves to those of the new vertex. + new_v->add_curves (e->curves_begin(), e->curves_end()); + } } - - if (res == EQUAL) - { - // In case of equality, append e's curves to those of the new vertex. - new_v->add_curves (e->curves_begin(), e->curves_end()); - } - - return; } //! \brief Functions that should be on Arr_traits_adaptor.