From a89fd2aa93db1312c8d88a98ef655e39505b80de Mon Sep 17 00:00:00 2001 From: Panagiotis Cheilaris Date: Wed, 1 Aug 2012 11:04:56 +0300 Subject: [PATCH] no warnings and 3 kernels in SDGLinf ipelet --- demo/ipe/linfvoronoi.cpp | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/demo/ipe/linfvoronoi.cpp b/demo/ipe/linfvoronoi.cpp index 149bb75ccc0..c3892d1b65d 100644 --- a/demo/ipe/linfvoronoi.cpp +++ b/demo/ipe/linfvoronoi.cpp @@ -1,5 +1,6 @@ -//~ #include +//#include +//#include #include #include #include @@ -13,14 +14,17 @@ namespace CGAL_linfvoronoi{ -//~ typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; -typedef CGAL::Cartesian Kernel; -typedef CGAL::Segment_Delaunay_graph_Linf_traits_2 Gt; -typedef CGAL::Segment_Delaunay_graph_Linf_2 SDG2; -typedef typename Kernel::Segment_2 Segment_2; -typedef CGAL::Polychainray_2 pcr; -typedef CGAL::Polychainsegment_2 pcs; -typedef CGAL::Polychainline_2 pcl; +// choice of kernel +//typedef CGAL::Exact_predicates_exact_constructions_kernel Kernel; +//typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; +typedef CGAL::Cartesian Kernel; + +typedef CGAL::Segment_Delaunay_graph_Linf_traits_2 Gt; +typedef CGAL::Segment_Delaunay_graph_Linf_2 SDG2; +typedef Kernel::Segment_2 Segment_2; +typedef CGAL::Polychainray_2 pcr; +typedef CGAL::Polychainsegment_2 pcs; +typedef CGAL::Polychainline_2 pcl; // -------------------------------------------------------------------- const std::string sublabel[] = { @@ -193,8 +197,8 @@ public: cast_pcs_into_seg(v_recup.pcs_list.begin(),v_recup.pcs_list.end(),bbox,std::back_inserter(seg_list));//cast pcs into segments in bbox //filter degenerate segments - for(typename std::list::iterator iteS = seg_list.begin();iteS!=seg_list.end();){ - typename std::list::iterator itc=iteS++; + for(std::list::iterator iteS = seg_list.begin();iteS!=seg_list.end();){ + std::list::iterator itc=iteS++; if (itc->is_degenerate()) seg_list.erase(itc); }