From 4acea234346e963338c00dc9b05bd95e735f963b Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 18 May 2010 08:12:56 +0000 Subject: [PATCH] Add using statements for ansi-compliance --- .../include/CGAL/Segment_Delaunay_graph_2.h | 3 ++- .../Segment_Delaunay_graph_2/Arrangement_type_C2.h | 5 +++++ .../Finite_edge_interior_conflict_C2.h | 11 +++++++++++ .../CGAL/Segment_Delaunay_graph_2/Oriented_side_C2.h | 4 ++++ .../Oriented_side_of_bisector_C2.h | 5 +++++ .../Segment_Delaunay_graph_2/Voronoi_vertex_ring_C2.h | 5 +++++ .../Voronoi_vertex_sqrt_field_new_C2.h | 1 + .../include/CGAL/Segment_Delaunay_graph_hierarchy_2.h | 11 +++++++++++ 8 files changed, 44 insertions(+), 1 deletion(-) diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h index dc9e84dde38..070dcbd15da 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h @@ -359,7 +359,8 @@ public: using Delaunay_graph::cw; using Delaunay_graph::ccw; - + using Delaunay_graph::delete_vertex; + using Delaunay_graph::delete_face; public: // TRAVERSAL OF THE DUAL GRAPH //---------------------------- diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Arrangement_type_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Arrangement_type_C2.h index ce8960637ae..a1227870d48 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Arrangement_type_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Arrangement_type_C2.h @@ -65,6 +65,11 @@ private: typedef Are_same_points_C2 Are_same_points_2; + using Base::compute_supporting_line; + using Base::oriented_side_of_line; + using Base::compute_perpendicular; + using Base::opposite_line; + private: Are_same_points_2 same_points; diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Finite_edge_interior_conflict_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Finite_edge_interior_conflict_C2.h index 463ce84ce86..1016672b9c8 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Finite_edge_interior_conflict_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Finite_edge_interior_conflict_C2.h @@ -60,6 +60,17 @@ public: typedef typename Base::Homogeneous_point_2 Homogeneous_point_2; + using Base::opposite_line; + using Base::compute_supporting_line; + using Base::oriented_side_of_line; + using Base::compare_squared_distances_to_line; + using Base::compare_squared_distances_to_lines; + using Base::compute_perpendicular; + using Base::projection_on_line; + using Base::compute_squared_distance; + + + private: typedef Are_same_points_C2 Are_same_points_2; typedef Are_same_segments_C2 Are_same_segments_2; diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Oriented_side_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Oriented_side_C2.h index 541374ceea8..72279d1818d 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Oriented_side_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Oriented_side_C2.h @@ -50,6 +50,10 @@ private: typedef typename Base::FT FT; typedef typename Base::RT RT; + + using Base::compute_supporting_line; + using Base::compute_perpendicular; + public: typedef typename Base::Oriented_side Oriented_side; typedef Oriented_side result_type; diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Oriented_side_of_bisector_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Oriented_side_of_bisector_C2.h index 4f3a29f740d..7dcff3f89df 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Oriented_side_of_bisector_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Oriented_side_of_bisector_C2.h @@ -60,6 +60,11 @@ public: typedef typename Base::Point_2 Point_2; typedef typename Base::Segment_2 Segment_2; + using Base::compute_supporting_line; + using Base::compute_perpendicular; + using Base::opposite_line; + using Base::oriented_side_of_line; + using Base::compute_squared_distance; private: bool is_endpoint(const Site_2& p, const Site_2& s) const { diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_ring_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_ring_C2.h index c9d5427568b..c73d83670ae 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_ring_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_ring_C2.h @@ -65,6 +65,11 @@ public: typedef typename Base::Oriented_side Oriented_side; typedef typename Base::Sign Sign; + using Base::compute_supporting_line; + using Base::oriented_side_of_line; + using Base::opposite_line; + using Base::to_ft; + private: typedef Are_same_points_C2 Are_same_points_2; typedef Are_same_segments_C2 Are_same_segments_2; diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_sqrt_field_new_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_sqrt_field_new_C2.h index 36e6cfc0df3..b5090295433 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_sqrt_field_new_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_sqrt_field_new_C2.h @@ -43,6 +43,7 @@ public: using Base::compute_supporting_line; using Base::oriented_side_of_line; using Base::opposite_line; + using Base::compute_projection; typedef enum {PPP = 0, PPS, PSS, SSS} vertex_t; struct PPP_Type {}; diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_hierarchy_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_hierarchy_2.h index cf883875b0e..3c192e05e1f 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_hierarchy_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_hierarchy_2.h @@ -106,7 +106,18 @@ protected: typedef typename Base::Handle_map Handle_map; typedef typename Base::Point_handle_pair Point_handle_pair; + using Base::merge_info; + using Base::same_segments; + using Base::is_degenerate_segment; + using Base::convert_info; + using Base::second_endpoint_of_segment; + using Base::split_storage_site; + using Base::first_endpoint_of_segment; + using Base::incircle; + public: + using Base::is_infinite; + typedef typename Base::Point_container Point_container; typedef typename Base::size_type size_type;