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

Merge branch 'releases/CGAL-4.10-branch' into releases/CGAL-4.11-branch

This commit is contained in:
Laurent Rineau 2017-10-23 16:55:54 +02:00
parent 7caa6ea021 605beb33ef
commit ce6e3a121f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
View File

@ -1523,7 +1523,8 @@ private:
c3t3.remove_from_complex(Facet(c,i));
c->set_facet_surface_center(i, facet_surface_center_[old_i]);
c->set_facet_surface_center_index(i, surface_center_index_table_[old_i]);
const Facet mirror = c3t3.triangulation().mirror_facet(Facet(c, i));
mirror.first->set_facet_surface_center(mirror.second, facet_surface_center_[old_i]);
}
}
@ -1542,7 +1543,8 @@ private:
c3t3.remove_from_complex(Facet(c, i));
c->set_facet_surface_center(i, facet_surface_center_[0]);
c->set_facet_surface_center_index(i, surface_center_index_table_[0]);
const Facet mirror = c3t3.triangulation().mirror_facet(Facet(c, i));
mirror.first->set_facet_surface_center(mirror.second, facet_surface_center_[0]);
return;
}
}

3
Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
View File

@ -65,6 +65,9 @@
#include <boost/format.hpp>
#ifdef CGAL_MESH_3_USE_RELAXED_HEAP
# error This option CGAL_MESH_3_USE_RELAXED_HEAP is no longer supported
// The reason is that the Boost relaxed heap does not ensure a strict order
// of the priority queue.
#include <boost/pending/relaxed_heap.hpp>
#else
#include <CGAL/Modifiable_priority_queue.h>