From 1d8716c0a48a0906ac6665ca670faed4431469cd Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Fri, 11 Jan 2019 10:28:08 +0100 Subject: [PATCH 1/2] Please add code in the #else --- ...ic_4_hyperbolic_Delaunay_triangulation_traits_2.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Periodic_4_hyperbolic_triangulation_2/include/CGAL/Periodic_4_hyperbolic_Delaunay_triangulation_traits_2.h b/Periodic_4_hyperbolic_triangulation_2/include/CGAL/Periodic_4_hyperbolic_Delaunay_triangulation_traits_2.h index 8c6e1ba01c3..d66a739d7cc 100644 --- a/Periodic_4_hyperbolic_triangulation_2/include/CGAL/Periodic_4_hyperbolic_Delaunay_triangulation_traits_2.h +++ b/Periodic_4_hyperbolic_triangulation_2/include/CGAL/Periodic_4_hyperbolic_Delaunay_triangulation_traits_2.h @@ -59,7 +59,11 @@ class Hyperbolic_traits_with_translations_2_adaptor public: typedef typename Predicate::result_type result_type; +#ifndef CGAL_CFG_MATCHING_BUG_6 using Predicate::operator(); +#else + +#endif Hyperbolic_traits_with_translations_2_adaptor(const Predicate_ pred = Predicate_()) : Predicate_(pred) {} @@ -119,9 +123,13 @@ private: public: typedef Point result_type; - + +#ifndef CGAL_CFG_MATCHING_BUG_6 using Construct_point_base::operator(); +#else +#endif + Periodic_4_construct_hyperbolic_point_2() { } Point operator()(const Point& pt, const Hyperbolic_translation& tr) const @@ -539,7 +547,7 @@ class Side_of_original_octagon FT s1 (CGAL::sqrt(n2 + CGAL::sqrt(n2))); // CGAL::sqrt(2 + CGAL::sqrt(2)) FT s2 (CGAL::sqrt(n2 - CGAL::sqrt(n2))); // CGAL::sqrt(2 - CGAL::sqrt(2)) FT s3 (CGAL::sqrt(sq2 - FT(1))); // CGAL::sqrt(CGAL::sqrt(2) - 1) - + _gt.construct_point_2_object()(s1*p34/n4, -s2*p34/n4); Hyperbolic_point_2 V0 = _gt.construct_hyperbolic_point_2_object()(_gt.construct_point_2_object()(s1*p34/n4, -s2*p34/n4)); Hyperbolic_point_2 V1 = _gt.construct_hyperbolic_point_2_object()(_gt.construct_point_2_object()(p14*(s1+s2)/n4, p14*(s1-s2)/n4)); Hyperbolic_point_2 V2 = _gt.construct_hyperbolic_point_2_object()(_gt.construct_point_2_object()(s2*p34/n4, s1*p34/n4)); From c0e9fd8c7418f779e66a26aefa4e14da737ca1f8 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Fri, 11 Jan 2019 10:28:51 +0100 Subject: [PATCH 2/2] Do not incliude more headers than necessary in tests. Are the boost randmom headers needed?? --- .../test_p4ht2_construct_point_2.cpp | 2 -- .../test_p4ht2_intersections.cpp | 2 -- .../Periodic_4_hyperbolic_triangulation_2/test_p4ht2_locate.cpp | 1 - .../test_p4ht2_removal.cpp | 1 - .../test_p4ht2_removal_iterator.cpp | 1 - 5 files changed, 7 deletions(-) diff --git a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_construct_point_2.cpp b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_construct_point_2.cpp index f5f11d95312..6f45ffe0399 100644 --- a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_construct_point_2.cpp +++ b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_construct_point_2.cpp @@ -4,8 +4,6 @@ #include #include -#include - typedef CORE::Expr NT; typedef CGAL::Cartesian Kernel; typedef CGAL::Periodic_4_hyperbolic_Delaunay_triangulation_traits_2 #include -#include #include #include -#include #include #include diff --git a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_locate.cpp b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_locate.cpp index be85debc312..6056e58397b 100644 --- a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_locate.cpp +++ b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_locate.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include diff --git a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_removal.cpp b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_removal.cpp index 3936d327253..9f441baa335 100644 --- a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_removal.cpp +++ b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_removal.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include diff --git a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_removal_iterator.cpp b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_removal_iterator.cpp index cfa95b4dc21..cfba1d0424c 100644 --- a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_removal_iterator.cpp +++ b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_removal_iterator.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include