From 852399875b34eae5d46cbb91063b69c8d03fe95b Mon Sep 17 00:00:00 2001 From: Baruch Zukerman Date: Tue, 17 Oct 2006 14:09:29 +0000 Subject: [PATCH] fixed the test suites with the changes of the envelope traits --- Envelope_3/test/Envelope_3/Envelope_test_3.h | 15 ++++++++------- .../test/Envelope_3/Envelope_triangles_test_3.h | 15 ++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Envelope_3/test/Envelope_3/Envelope_test_3.h b/Envelope_3/test/Envelope_3/Envelope_test_3.h index 6cfafeea469..4d4041dd694 100644 --- a/Envelope_3/test/Envelope_3/Envelope_test_3.h +++ b/Envelope_3/test/Envelope_3/Envelope_test_3.h @@ -119,19 +119,20 @@ public: Xy_monotone_surface_3 &cur_surface = surfaces[i]; // first insert all the projected curves of the boundary of the current surface // collect the curve in this list, and use sweepline at the end - std::list > boundary_list; + std::list boundary_list; + typedef std::pair Boundary_xcurve; - typedef typename std::list >::iterator Boundary_iterator; + typedef std::list::const_iterator Boundary_iterator; traits.construct_projected_boundary_2_object()(cur_surface, std::back_inserter(boundary_list)); for(Boundary_iterator boundary_it = boundary_list.begin(); boundary_it != boundary_list.end(); ++boundary_it) { - const Object& obj = boundary_it->first; - X_monotone_curve_2 cv; - CGAL_assertion(assign(cv, obj)); - assign(cv, obj); - curves_col.push_back(cv); + const Object& obj = *boundary_it; + Boundary_xcurve boundary_cv; + CGAL_assertion(assign(boundary_cv, obj)); + assign(boundary_cv, obj); + curves_col.push_back(boundary_cv.first); } // second, intersect it with all surfaces before it diff --git a/Envelope_3/test/Envelope_3/Envelope_triangles_test_3.h b/Envelope_3/test/Envelope_3/Envelope_triangles_test_3.h index e6bd2533070..bb8eb48613c 100644 --- a/Envelope_3/test/Envelope_3/Envelope_triangles_test_3.h +++ b/Envelope_3/test/Envelope_3/Envelope_triangles_test_3.h @@ -124,18 +124,19 @@ public: #endif // collect the curve in this list, and use sweepline at the end - std::list > boundary_list; + std::list boundary_list; + typedef std::pair Boundary_xcurve; traits.construct_projected_boundary_2_object()(cur_surface, std::back_inserter(boundary_list)); - typedef typename std::list >::iterator Boundary_iterator; + typedef std::list::const_iterator Boundary_iterator; for(Boundary_iterator boundary_it = boundary_list.begin(); boundary_it != boundary_list.end(); ++boundary_it) { - const Object& obj = boundary_it->first; - X_monotone_curve_2 cv; - CGAL_assertion(assign(cv, obj)); - assign(cv, obj); - curves_col.push_back(cv); + const Object& obj = *boundary_it; + Boundary_xcurve boundary_cv; + CGAL_assertion(assign(boundary_cv, obj)); + assign(boundary_cv, obj); + curves_col.push_back(boundary_cv.first); } // second, intersect it with all surfaces before it Object cur_obj;