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

Merge branch 'Triangulation_3-fix_warning_assume_patch-lrineau'

This commit is contained in:
Laurent Rineau 2013-02-25 10:53:10 +01:00
parent de5f238a71 bd0930fc26
commit e171941e24
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Triangulation_3/include/CGAL/Triangulation_data_structure_3.h
View File

@ -2420,8 +2420,8 @@ insert_increase_dimension(Vertex_handle star)
{
Cell_handle c = star->cell();
int i = c->index(star); // i== 0 or 1
CGAL_assume(i<=1);
int j = (1-i);
CGAL_assertion(i==0 || i==1);
int j = (i == 0) ? 1 : 0;
Cell_handle d = c->neighbor(j);
c->set_vertex(2,v);
@ -2619,8 +2619,7 @@ remove_degree_2(Vertex_handle v)
c0 = v->cell();
i0 = c0->index(v);
CGAL_assume(i0<=1);
c1 = c0->neighbor(1-i0);
c1 = c0->neighbor((i0 == 0) ? 1 : 0);
i1 = c1->index(v);
// New cell : we copy the content of c0, so we keep the orientation.