From fab384d4ccee6240cfa6e382b7fb2fbcf366c3e8 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 14 Apr 2020 13:52:01 +0200 Subject: [PATCH 1/2] Fix Python script that inserted a `` incorrectly --- Documentation/doc/scripts/html_output_post_processing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/doc/scripts/html_output_post_processing.py b/Documentation/doc/scripts/html_output_post_processing.py index 1fd9d444db3..1e984b769bc 100755 --- a/Documentation/doc/scripts/html_output_post_processing.py +++ b/Documentation/doc/scripts/html_output_post_processing.py @@ -363,7 +363,7 @@ removes some unneeded files, and performs minor repair on some glitches.''') class_and_struct_files=list(package_glob('./*/class*.html')) class_and_struct_files.extend(package_glob('./*/struct*.html')) for fn in class_and_struct_files: - re_replace_first_in_file(r'

Inherits\s*(.*)

', r'

Inherits from

\1

', fn) + re_replace_first_in_file(r'

Inherits\s*(.*)

', r'

Inherits from

\1

', fn) # remove class name in Definition section if there is no default template # parameter documented From 1c3d644b3c73447394bfec69f2ecc9994ac7c393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 14 Apr 2020 17:45:02 +0200 Subject: [PATCH 2/2] use Exact_field_selector --- .../Segment_Delaunay_graph_filtered_traits_2.h | 13 ++----------- ...Segment_Delaunay_graph_Linf_filtered_traits_2.h | 14 +++----------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_filtered_traits_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_filtered_traits_2.h index 5cce5699cc6..1fdf6e45bcf 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_filtered_traits_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_filtered_traits_2.h @@ -36,12 +36,7 @@ #include // includes for the default parameters of the filtered traits -#ifdef CGAL_USE_GMP -#include -#else -#include -#include -#endif +#include #include #include @@ -65,11 +60,7 @@ namespace CGAL { // this traits class does support intersecting segments template, -#else - class EK = Simple_cartesian< Quotient >, -#endif + class EK = Simple_cartesian< internal::Exact_field_selector::Type >, class EK_MTag = Field_tag, class FK = Simple_cartesian< Interval_nt >, class FK_MTag = Field_with_sqrt_tag, diff --git a/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_filtered_traits_2.h b/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_filtered_traits_2.h index 6e0613972a5..676118e412e 100644 --- a/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_filtered_traits_2.h +++ b/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_filtered_traits_2.h @@ -33,12 +33,8 @@ #include // includes for the default parameters of the filtered traits -#ifdef CGAL_USE_GMP -#include -#else -#include -#include -#endif +#include + #include #include @@ -62,11 +58,7 @@ namespace CGAL { // this traits class does support intersecting segments template, -#else - class EK = Simple_cartesian< Quotient >, -#endif + class EK = Simple_cartesian< internal::Exact_field_selector::Type >, class EK_MTag = Field_tag, class FK = Simple_cartesian< Interval_nt >, class FK_MTag = Field_with_sqrt_tag,