From 454451556be97ebe8ab837bde831f1aa7e724512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 8 Jul 2013 07:47:42 +0200 Subject: [PATCH 1/3] use correct include header --- .../examples/Segment_Delaunay_graph_2/sdg-fast-sp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Segment_Delaunay_graph_2/examples/Segment_Delaunay_graph_2/sdg-fast-sp.cpp b/Segment_Delaunay_graph_2/examples/Segment_Delaunay_graph_2/sdg-fast-sp.cpp index 118dd78d33a..67e55a3b1a8 100644 --- a/Segment_Delaunay_graph_2/examples/Segment_Delaunay_graph_2/sdg-fast-sp.cpp +++ b/Segment_Delaunay_graph_2/examples/Segment_Delaunay_graph_2/sdg-fast-sp.cpp @@ -12,7 +12,7 @@ typedef CGAL::Simple_cartesian K; // typedefs for the traits and the algorithm -#include +#include #include typedef CGAL::Segment_Delaunay_graph_filtered_traits_without_intersections_2 Gt; From 42fa0442733e0abd9ca04fdfd682e0b5daa0e813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 8 Jul 2013 07:58:56 +0200 Subject: [PATCH 2/3] fix warnings --- .../Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h | 2 +- .../test/Segment_Delaunay_graph_2/include/test_types.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h index 336fffca192..c5d43070a75 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h @@ -1740,7 +1740,7 @@ fill_hole(const Self& small_d, const Vertex_handle& v, const List& l, Face_circulator fc_start = incident_faces(v); Face_circulator fc = fc_start; Face_circulator fc_begin; - bool found = false; + CGAL_assertion_code( bool found = false; ) do { int id = fc->index(v); Vertex_handle v_lrg_src = fc->vertex(ccw(id)); diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h index 7b78b276bc6..573f00e38b5 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h @@ -3,6 +3,7 @@ #include #include +#include #include #include #include @@ -92,6 +93,7 @@ bool test_sdg(InputStream&, const SDG&, const char* ifname, const char* ofname, typedef typename SDG2::Site_2 Site_2; typedef typename SDG2::Point_container Point_container; typedef typename SDG2::Point_handle Point_handle; + CGAL_USE_TYPE(Point_handle); typedef typename SDG2::Edge Edge; typedef typename SDG2::Vertex_handle Vertex_handle; From 8b7c074e7fb3d8faf6b6b0296077b8a8e7585537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 9 Jul 2013 07:43:22 +0200 Subject: [PATCH 3/3] hide variable when not used --- .../Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h index c5d43070a75..30e16d318ce 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h @@ -1746,7 +1746,7 @@ fill_hole(const Self& small_d, const Vertex_handle& v, const List& l, Vertex_handle v_lrg_src = fc->vertex(ccw(id)); Vertex_handle v_lrg_trg = fc->vertex(cw(id)); if ( vmap[v_sml_src] == v_lrg_src && vmap[v_sml_trg] == v_lrg_trg ) { - found = true; + CGAL_assertion_code( found = true; ) fc_begin = fc; break; }