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

Copy boost::bind return object 

The lazy kernel returns temporaries and gives garbage to compare_xyz_3...
This commit is contained in:
Mael Rouxel-Labbé 2017-04-28 14:38:27 +02:00
parent 88577013a0
commit b669bb2d13
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Triangulation_3/include/CGAL/Regular_triangulation_3.h
View File

@ -1700,14 +1700,14 @@ dual(Cell_handle c) const
// We sort the points lexicographically.
const Weighted_point * points[5] = {&p0, &p1, &p2, &p3, &p};
// It is important to tell boost::bind that we want references in return
// by writing `boost::bind<const ... &>(...)` otherwise we get temporaries
// and we call Compare_xyz_3 on objects that might have been cleaned
// Lazy_Kernel::Construct_point_3 can return temporaries and so we have to
// copy the Bare_point...
std::sort(points, points + 5,
boost::bind<Comparison_result>(geom_traits().compare_xyz_3_object(),
boost::bind<const Bare_point&>(
boost::bind<const Bare_point>(
cp, boost::bind<const Weighted_point&>(Dereference<Weighted_point>(), _1)),
boost::bind<const Bare_point&>(
boost::bind<const Bare_point>(
cp, boost::bind<const Weighted_point&>(Dereference<Weighted_point>(), _2)))
== SMALLER);
@ -1819,14 +1819,13 @@ dual(Cell_handle c) const
// We sort the points lexicographically.
const Weighted_point * points[4] = {&p0, &p1, &p2, &p};
// It is important to tell boost::bind that we want references in return
// by writing `boost::bind<const ... &>(...)` otherwise we get temporaries
// and we call Compare_xyz_3 on objects that might have been cleaned
// Lazy_Kernel::Construct_point_3 can return temporaries and so we have to
// copy the Bare_point...
std::sort(points, points + 4,
boost::bind<Comparison_result>(geom_traits().compare_xyz_3_object(),
boost::bind<const Bare_point&>(
boost::bind<const Bare_point>(
cp, boost::bind<const Weighted_point&>(Dereference<Weighted_point>(), _1)),
boost::bind<const Bare_point&>(
boost::bind<const Bare_point>(
cp, boost::bind<const Weighted_point&>(Dereference<Weighted_point>(), _2)))
== SMALLER);