From f6e3221d98fff63ddff8ce00a1f34a9b12d6c38a Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 17 Apr 2019 22:33:04 +0200 Subject: [PATCH] Easy fixes after Mael's review --- .../include/CGAL/Partition_2/Indirect_edge_compare.h | 9 ++------- .../include/CGAL/Partition_2/Partition_vertex_map.h | 2 +- Partition_2/include/CGAL/Partition_traits_adapter_2.h | 6 +++--- .../Spatial_sorting/CGAL/Spatial_sort_traits_adapter_2.h | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Partition_2/include/CGAL/Partition_2/Indirect_edge_compare.h b/Partition_2/include/CGAL/Partition_2/Indirect_edge_compare.h index 708db22a61c..1441a86f133 100644 --- a/Partition_2/include/CGAL/Partition_2/Indirect_edge_compare.h +++ b/Partition_2/include/CGAL/Partition_2/Indirect_edge_compare.h @@ -37,7 +37,7 @@ template class Indirect_edge_compare { public: - typedef typename Traits::Orientation_2 Orientation_2; + typedef typename Traits::Orientation_2 Orientation_2; typedef typename Traits::Compare_y_2 Compare_y_2; typedef typename Traits::Compare_x_2 Compare_x_2; typedef typename Traits::Point_2 Point_2; @@ -74,11 +74,6 @@ class Indirect_edge_compare Comparison_result compare_x_at_y(const Point_2& p, const Point_2& a, const Point_2& b) const { - Comparison_result cr = _compare_x_2(a, b); - if(cr == EQUAL){ - // line ab is vertical - return _compare_x_2(p,a); - } Orientation ori = _orientation_2(a, b, p); if(ori == COLLINEAR){ return EQUAL; @@ -119,7 +114,7 @@ class Indirect_edge_compare { if(_compare_y_2(Point_2(*q), Point_2(*after_q)) == EQUAL) { - Point_2 p_max; + Point_2 p_max; Point_2 q_max; if (_compare_x_2(Point_2(*p), Point_2(*after_p)) == SMALLER) p_max = *after_p; diff --git a/Partition_2/include/CGAL/Partition_2/Partition_vertex_map.h b/Partition_2/include/CGAL/Partition_2/Partition_vertex_map.h index e1598109ea8..cead0f87e9f 100644 --- a/Partition_2/include/CGAL/Partition_2/Partition_vertex_map.h +++ b/Partition_2/include/CGAL/Partition_2/Partition_vertex_map.h @@ -74,7 +74,7 @@ template class Vertex_info_less { public: - Vertex_info_less(const Traits_ traits) + Vertex_info_less(const Traits_& traits) : traits(traits) {} diff --git a/Partition_2/include/CGAL/Partition_traits_adapter_2.h b/Partition_2/include/CGAL/Partition_traits_adapter_2.h index 201488338d5..d4b79c96959 100644 --- a/Partition_2/include/CGAL/Partition_traits_adapter_2.h +++ b/Partition_2/include/CGAL/Partition_traits_adapter_2.h @@ -44,11 +44,12 @@ private: PointPropertyMap ppmap; public: - Partition_traits_adapter_2(Base_traits base=Base_traits()) + Partition_traits_adapter_2(const Base_traits& base=Base_traits()) : Base_traits(base) {} - Partition_traits_adapter_2(const PointPropertyMap& ppmap,Base_traits base=Base_traits()) + Partition_traits_adapter_2(const PointPropertyMap& ppmap, + const Base_traits& base=Base_traits()) : Base_traits(base),ppmap(ppmap) {} @@ -58,7 +59,6 @@ public: typedef ::std::list Container; typedef CGAL::Polygon_2 Polygon_2; - template struct Pmap_fct : public BaseFct { diff --git a/Spatial_sorting/doc/Spatial_sorting/CGAL/Spatial_sort_traits_adapter_2.h b/Spatial_sorting/doc/Spatial_sorting/CGAL/Spatial_sort_traits_adapter_2.h index baa93d0566d..1ec4e451e27 100644 --- a/Spatial_sorting/doc/Spatial_sorting/CGAL/Spatial_sort_traits_adapter_2.h +++ b/Spatial_sorting/doc/Spatial_sorting/CGAL/Spatial_sort_traits_adapter_2.h @@ -25,7 +25,7 @@ public: /*! */ -typdef boost::property_traits::key_type Point_2; +typedef boost::property_traits::key_type Point_2; /// @}