It seems that Boost.Config says std::tuple does not work, even if
variadic templates are usable.
Trivial fix for master.
(cherry picked from commit e60c9ec190611c711fff7bb9a5ffc463f93e31b7)
Merge that branch with the strategy "-s ours", to merge the history of
the branch, but not the patches. That means that 'master is not modified
by this special merge commit. That will allow to remove the branch. Its
history will be somehow hidden in the right children of *this* commit,
in case we want to recreate it.
That branch 'origin/Mesh_3-do_intersect_Bbox_Segment_3-GF' is the
experimental work that was done before the clean branch
'Intersections_3-Faster_do_intersect_bbox_segment-GF' was created. This
later branch was merged by the following commit:
| commit 0fd9d5b66b
| Merge: f809ccefa4697b
| Author: Laurent Rineau <laurent.rineau@cgal.org>
| Date: Fri Dec 20 17:07:51 2013 +0100
|
| Merge branch 'Intersections_3-Faster_do_intersect_bbox_segment-GF'
|
| By adding extra early tests, the Do_intersect_3(Bbox_3, Segment_3|Ray_3) is
| faster, at least for the usage of AABB tree made by Mesh_3 on polyhedral
| data.
|
| Benches have shown an average speedup of a factor 2, both on
| Linux (x86_64) and Windows (x86_64), while meshing surfaces with
| CGAL::make_mesh_3() (with only criteria on facets, and no mesh optimizers).
|
| Tested in CGAL-4.4-Ic-62
The experimental branch 'origin/Mesh_3-do_intersect_Bbox_Segment_3-GF'
(that I will remove just after this commit) contains various possible
implementations to improve the speed of the predicate, along with
benchmarks. The cleaner branch
'Intersections_3-Faster_do_intersect_bbox_segment-GF' was created once
one has chosen the best implementation according to tests and benchmarks.
Fixes bugs in the 3D convex hull traits concept, in particular due to the
handling of coplanar points
Tested in CGAL-4.5-Ic-72
Approved by the release manager
Conflicts:
Installation/changes.html
* update friend declarations
* remove useless this->set_current_dart(this->mmap->null_handle) in Dart_iterators.h
* Use inner definition CMap::Dart_of_cell_basic_const_range<i> instead of directly the class CGAL::CMap_dart_const_iterator_basic_of_cell in internal/Combinatorial_map_internal_functors.h (more generic)
Fix Regular_triangulation_cell_base_with_weighted_circumcenter_3.
The default value for the template parameter 'Cell base' is replaced by
Regular_triangulation_cell_base_3. (The doc is updated.)
The operator= is fixed. (The copy-and-swap idiom is implemented.)
A test file is added for this class.
Successfully tested in the internal release CGAL-4.5-Ic-63.
Approved by the Release Manager.
Andreas Fabri
Laurent Rineau
Sébastien Loriot
Marc Glisse
Efi Fogel
Guillaume Damiand
Aymeric PELLE