... to be a pair< variant<XXX>, Primitive_id > rather than
pair<optional<variant<XXX> >, Primitive_id >
The rational is that the optional around the variant here is not needed
since there is one around the pair.
I just needed to added a constructor where the approximate predicates and exact
one needed to be provided (which is reasonable and cannot hurts thanks to the
explicit)
That is a followup-to my commit last year:
| ------------------------------------------------------------------------
| r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
|
| Try to fix my last revision about cmake_policy, with CMake-2.6.x
|
| CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
| x.y.z is greater than the current CMake version.
|
| ------------------------------------------------------------------------
The following check:
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
cmake_minimum_required(VERSION 2.6.2)
The script used to fix that was:
#!/usr/bin/env perl
$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
cmake_policy(VERSION 2.8.4)
else()
cmake_policy(VERSION 2.6)
endif()
END
while(<>) {
if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
while(<>) {
if(/^endif\(\)/) {
print "$replacement";
while(<>) {
print;
}
exit 0
}
}
}
print;
}
The static filters of Do_intersect(BBox_3, Segment_3) and
Do_intersect(BBox_3, Segment_3) now use do_intersect_bbox_segment_aux(..)
from CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h
That example no longer compiles. It was hidden by dont_submit for a long
time, but with a full branch-build (with WITH_demos and WITH_examples
enabled), it is in the way.
AABB_tree documentation, Intersections_3 and Arrangement_on_surface_2.
The merge also introduced a regression for a bug fixed in R68387 which
fixed a bug in Triangle_3 Segment_3 intersections. The relevant
testcase is in triangle_other_intersection_test.cpp.
CGAL_DISABLE_RECENTLY_ADDED_STATIC_FILTERS was misleading because
of... "recently"! What would mean that macro in several months?
I have changed it to CGAL_DISABLE_STATIC_FILTERS_ADDED_2011. As a matter of
fact, only GeometryFactory has added static filters to the CGAL kernel
during year 2011, and it was only the filters added November/December:
Is_degenerate_3 -- only for Ray_3 and Segment_3
Do_intersect_3 -- only for BBox_3-Ray_3 and BBox_3-Segment_3
Angle_3 -- only the operator()(Point_3, Point_3, Point_3)
| ------------------------------------------------------------------------
| r66638 | afabri | 2011-12-02 23:00:04 +0100 (Fri, 02 Dec 2011) | 1 line
|
| Remove unnecessary abs()
| ------------------------------------------------------------------------
It must be applied to a new branch of next.
Do_intersect_3 has a template member function. If one use
CGAL_PRETTY_FUNCTION as function name, then the compiler gives the full
name of the function, with its parameters.
Sébastien Loriot
Laurent Rineau
Andreas Fabri
Marc Glisse
Philipp Möller
Laurent Rineau
Philipp Möller