From b54b62fcc4a0d2750ab6ec00d1529b9e66330c91 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 12 Nov 2020 09:40:22 +0000 Subject: [PATCH 1/3] Convex_hull_3: Fix constness --- Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt | 2 ++ Convex_hull_3/include/CGAL/convexity_check_3.h | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt b/Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt index cb303aca822..14db7e14f67 100644 --- a/Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt +++ b/Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt @@ -42,6 +42,8 @@ endif() # Creating entries for all C++ files with "main" routine # ########################################################## +create_single_source_cgal_program( "is_strongly_convex_3.cpp" ) + create_single_source_cgal_program( "dynamic_hull_3.cpp" ) create_single_source_cgal_program( "dynamic_hull_LCC_3.cpp" ) diff --git a/Convex_hull_3/include/CGAL/convexity_check_3.h b/Convex_hull_3/include/CGAL/convexity_check_3.h index 929001806cc..3b1c33435e8 100644 --- a/Convex_hull_3/include/CGAL/convexity_check_3.h +++ b/Convex_hull_3/include/CGAL/convexity_check_3.h @@ -187,13 +187,13 @@ bool is_strongly_convex_3(const Polyhedron& P, const Traits& traits) } template -bool CGAL_is_strongly_convex_3(Polyhedron& P, Point_3*) +bool CGAL_is_strongly_convex_3(const Polyhedron& P, Point_3*) { return is_strongly_convex_3(P, R()); } template -bool is_strongly_convex_3(Polyhedron& P) +bool is_strongly_convex_3(const Polyhedron& P) { typedef typename boost::property_map::type Ppmap; typedef typename boost::property_traits::value_type Point_3; @@ -204,7 +204,7 @@ bool is_strongly_convex_3(Polyhedron& P) template bool all_points_inside( ForwardIterator first, ForwardIterator last, - Polyhedron& P, + const Polyhedron& P, const Traits& traits) { typedef typename Traits::Plane_3 Plane_3; From df61ad936750c9a14ba5dcdda2c563ad2bd658c1 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 12 Nov 2020 10:56:40 +0100 Subject: [PATCH 2/3] Update Convex_hull_3/include/CGAL/convexity_check_3.h Co-authored-by: Sebastien Loriot --- Convex_hull_3/include/CGAL/convexity_check_3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Convex_hull_3/include/CGAL/convexity_check_3.h b/Convex_hull_3/include/CGAL/convexity_check_3.h index 3b1c33435e8..cd18bf1d394 100644 --- a/Convex_hull_3/include/CGAL/convexity_check_3.h +++ b/Convex_hull_3/include/CGAL/convexity_check_3.h @@ -195,7 +195,7 @@ bool CGAL_is_strongly_convex_3(const Polyhedron& P, Point_3*) template bool is_strongly_convex_3(const Polyhedron& P) { - typedef typename boost::property_map::type Ppmap; + typedef typename boost::property_map::const_type Ppmap; typedef typename boost::property_traits::value_type Point_3; return CGAL_is_strongly_convex_3(P, reinterpret_cast(0)); From 344356a306ca6fc181a0260a09d412544650515d Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 12 Nov 2020 09:58:05 +0000 Subject: [PATCH 3/3] Fix CMakeLists.txt --- Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt b/Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt index 14db7e14f67..cb303aca822 100644 --- a/Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt +++ b/Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt @@ -42,8 +42,6 @@ endif() # Creating entries for all C++ files with "main" routine # ########################################################## -create_single_source_cgal_program( "is_strongly_convex_3.cpp" ) - create_single_source_cgal_program( "dynamic_hull_3.cpp" ) create_single_source_cgal_program( "dynamic_hull_LCC_3.cpp" )