From eb10e59623d7af123e8d8c30d011d1ce226a0bd5 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Tue, 3 Jul 2018 11:39:33 +0200 Subject: [PATCH] Fix and more clean-up of the doc --- .../CGAL/Extreme_points_traits_adapter_3.h | 2 +- .../CGAL/Extreme_points_traits_adapter_3.h | 15 ++++++++++++--- .../test/Convex_hull_3/test_extreme_points.cpp | 2 ++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Convex_hull_3/doc/Convex_hull_3/CGAL/Extreme_points_traits_adapter_3.h b/Convex_hull_3/doc/Convex_hull_3/CGAL/Extreme_points_traits_adapter_3.h index 4dbf32fd048..ad468b71699 100644 --- a/Convex_hull_3/doc/Convex_hull_3/CGAL/Extreme_points_traits_adapter_3.h +++ b/Convex_hull_3/doc/Convex_hull_3/CGAL/Extreme_points_traits_adapter_3.h @@ -18,7 +18,7 @@ namespace CGAL { * \cgalModels `ConvexHullTraits_3` * \cgalModels `IsStronglyConvexTraits_3` */ -template +template class Extreme_points_traits_adapter_3 { public: diff --git a/Convex_hull_3/include/CGAL/Extreme_points_traits_adapter_3.h b/Convex_hull_3/include/CGAL/Extreme_points_traits_adapter_3.h index 3b5ed34decc..599f3f948c6 100644 --- a/Convex_hull_3/include/CGAL/Extreme_points_traits_adapter_3.h +++ b/Convex_hull_3/include/CGAL/Extreme_points_traits_adapter_3.h @@ -79,8 +79,8 @@ struct Forward_functor }//end Convex_hull_impl template< class PointPropertyMap, - class Base_traits=internal::Convex_hull_3::Default_traits_for_Chull_3< - typename boost::property_traits::type> + class Base_traits=typename internal::Convex_hull_3::Default_traits_for_Chull_3< + typename boost::property_traits::value_type>::type > class Extreme_points_traits_adapter_3 :public Base_traits @@ -241,10 +241,19 @@ public: }; template Extreme_points_traits_adapter_3 -make_extreme_points_traits_adapter(const PointPropertyMap& pmap, Base_traits traits) +make_extreme_points_traits_adapter(const PointPropertyMap& pmap, Base_traits traits = Base_traits()) { return Extreme_points_traits_adapter_3(pmap, traits); } + +template +Extreme_points_traits_adapter_3 +make_extreme_points_traits_adapter(const PointPropertyMap& pmap) +{ + return Extreme_points_traits_adapter_3(pmap); +} + + //helper function }//end CGAL diff --git a/Convex_hull_3/test/Convex_hull_3/test_extreme_points.cpp b/Convex_hull_3/test/Convex_hull_3/test_extreme_points.cpp index 5f2aa51c4d6..6af016c153c 100644 --- a/Convex_hull_3/test/Convex_hull_3/test_extreme_points.cpp +++ b/Convex_hull_3/test/Convex_hull_3/test_extreme_points.cpp @@ -225,6 +225,8 @@ void test_extreme_vertices(const char* fname) std::vector::vertex_descriptor> verts; CGAL::extreme_points_3(vertices(P), std::back_inserter(verts) , CGAL::make_extreme_points_traits_adapter(pmap, traits)); + CGAL::extreme_points_3(vertices(P), std::back_inserter(verts) , + CGAL::make_extreme_points_traits_adapter(pmap)); } int main()