From 87c36f092d71bf78a1aca421f8434d2299a4e36f Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Mon, 2 Jun 2003 22:15:31 +0000 Subject: [PATCH] - Intel CC workarounds. --- Packages/Triangulation_3/changes.txt | 3 +++ .../include/CGAL/Triangulation_data_structure_3.h | 5 ++++- .../test/Triangulation_3/include/CGAL/_test_cls_tds_3.C | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Packages/Triangulation_3/changes.txt b/Packages/Triangulation_3/changes.txt index fe13ee440c3..64e0c503dc5 100644 --- a/Packages/Triangulation_3/changes.txt +++ b/Packages/Triangulation_3/changes.txt @@ -1,3 +1,6 @@ +Version 1.147 (3 June 03) +- workaround for Intel in test_cls_tds_3.C and Triangulation_data_structure_3 + Version 1.146 (2 June 03) - Doc : typography rules in English : "~:" replaced by ":". - Test-suite : Use Filtered_kernel<>. diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h index 09f9ca4599e..8cd7ebc5212 100644 --- a/Packages/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h +++ b/Packages/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h @@ -1992,7 +1992,10 @@ insert_increase_dimension(Vertex_handle star) if ( ! it->has_vertex(star) ) { Cell_handle cnew = create_cell( it->vertex(0), it->vertex(2), it->vertex(1), star); - set_adjacency(cnew, 3, it, 3); + // The Intel compiler has a problem with passing "it" directly to + // function "set_adjacency": the adjacency is not changed. + Cell_handle ch_it = it; + set_adjacency(cnew, 3, ch_it, 3); cnew->set_neighbor(0, NULL); new_cells.push_back(cnew); } diff --git a/Packages/Triangulation_3/test/Triangulation_3/include/CGAL/_test_cls_tds_3.C b/Packages/Triangulation_3/test/Triangulation_3/include/CGAL/_test_cls_tds_3.C index 2eef096c520..77e75b2073e 100644 --- a/Packages/Triangulation_3/test/Triangulation_3/include/CGAL/_test_cls_tds_3.C +++ b/Packages/Triangulation_3/test/Triangulation_3/include/CGAL/_test_cls_tds_3.C @@ -175,7 +175,9 @@ _test_cls_tds_3( const Tds &) next_cell = ++cit; --cit; while ( (! flipped) && (i<4) ) { if ( (i!=j) ) { - flipped = tds6.flip( cit, i, j ) ; + // The Intel compiler has a bug and needs the explicit handle. + Cell_handle ch = cit; + flipped = tds6.flip( ch, i, j ) ; if (flipped) { nbflips++; assert(tds6.is_valid());