songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Segment_Delaunay_graph_2-remove_warnings-local' 

Sucessfully tested in CGAL-4.3-Ic-86
This commit is contained in:
Sébastien Loriot 2013-07-10 16:54:10 +02:00
parent 3ec78d4c6a 8b7c074e7f
commit ea6fd4754a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Segment_Delaunay_graph_2/examples/Segment_Delaunay_graph_2/sdg-fast-sp.cpp
View File

@ -12,7 +12,7 @@
typedef CGAL::Simple_cartesian<double> K;
// typedefs for the traits and the algorithm
#include <CGAL/Segment_Delaunay_graph_hierarchy_2.h>
#include <CGAL/Segment_Delaunay_graph_2.h>
#include <CGAL/Segment_Delaunay_graph_filtered_traits_2.h>
typedef CGAL::Segment_Delaunay_graph_filtered_traits_without_intersections_2<K> Gt;

4
Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h
View File

@ -1740,13 +1740,13 @@ 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));
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;
}

2
Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h
View File

@ -3,6 +3,7 @@
#include <CGAL/basic.h>
#include <CGAL/enum.h>
#include <CGAL/use.h>
#include <iostream>
#include <cctype>
#include <algorithm>
@ -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;