diff --git a/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h b/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h index 00d3252e995..76a0b601e58 100644 --- a/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h +++ b/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h @@ -482,13 +482,13 @@ class Algebraic_structure_traits_base< Type_, Field_tag > : public std::binary_function< Type, Type, bool > { public: bool operator()( const Type& CGAL_precondition_code(x), const Type& /* y */) const { - typedef Algebraic_structure_traits AST; + CGAL_precondition_code( typedef Algebraic_structure_traits AST); CGAL_precondition( typename AST::Is_zero()(x) == false ); return true; } // second operator computing q bool operator()( const Type& x, const Type& y, Type& q) const { - typedef Algebraic_structure_traits AST; + CGAL_precondition_code(typedef Algebraic_structure_traits AST); CGAL_precondition( typename AST::Is_zero()(x) == false ); q = y/x; return true; diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Descartes.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Descartes.h index b332f71af2e..cc38633528f 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Descartes.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Descartes.h @@ -264,7 +264,6 @@ public: private: void intern_decompose( Polynomial P_, ::CGAL::Tag_true){ typename FT_poly::Decompose decompose; - typedef typename FT_poly::Numerator_type Numerator_poly; typename FT_poly::Numerator_type NumP; typename FT_poly::Denominator_type dummy; diff --git a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomial_1_2_and_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomial_1_2_and_2_2.h index 99dabb56957..e15371d58ba 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomial_1_2_and_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomial_1_2_and_2_2.h @@ -174,7 +174,6 @@ namespace CGAL { Sign sign_at( const typename AK::Polynomial_1_2 & equation, const typename AK::Root_for_circles_2_2 & r) { - typedef typename AK::Root_of_2 Root_of_2; Comparison_result c = compare(r.x()*equation.a(), -equation.c() - r.y()*equation.b()); if(c == EQUAL) return ZERO; diff --git a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomials_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomials_2_2.h index 69e4a9700d1..8dcacbe07c3 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomials_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomials_2_2.h @@ -158,7 +158,6 @@ namespace CGAL { Sign sign_at( const typename AK::Polynomial_for_circles_2_2 & equation, const typename AK::Root_for_circles_2_2 & r) { - typedef typename AK::Root_of_2 Root_of_2; Comparison_result c = compare(square(r.x() - equation.a()), equation.r_sq() - square(r.y() - equation.b())); @@ -186,7 +185,6 @@ namespace CGAL { x_critical_points(const typename AK::Polynomial_for_circles_2_2 & c, OutputIterator res) { - typedef typename AK::Root_of_2 Root_of_2; typedef typename AK::FT FT; typedef typename AK::Root_for_circles_2_2 Root_for_circles_2_2; @@ -216,8 +214,6 @@ namespace CGAL { y_critical_points(const typename AK::Polynomial_for_circles_2_2 & c, OutputIterator res) { - typedef typename AK::Root_of_2 Root_of_2; - typedef typename AK::FT FT; typedef typename AK::Root_for_circles_2_2 Root_for_circles_2_2; *res++ = Root_for_circles_2_2(c.a(), diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h index 63d6b403000..efc735abe4f 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h @@ -244,7 +244,7 @@ primal(const Edge e) const { typedef typename Geom_traits::Segment_2 Segment; typedef typename Geom_traits::Ray_2 Ray; - typedef CGAL::Hyperbola_segment_2 Hyperbola_segment; + // typedef CGAL::Hyperbola_segment_2 Hyperbola_segment; typedef CGAL::Parabola_segment_2 Parabola_segment; // typedef typename Geom_traits::Hyperbola_segment_2 Hyperbola_segment; // typedef typename Geom_traits::Parabola_segment_2 Parabola_segment; diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h index 9bc0abe79e9..28584dddfec 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h @@ -214,7 +214,6 @@ void insert (Arrangement_on_surface_2& arr, const Curve& c, const PointLocation& pl, typename PointLocation::Point_2*) { - typedef Arrangement_on_surface_2 Arr; typedef typename TopTraits::Zone_insertion_visitor Zone_visitor; Zone_visitor visitor; @@ -1184,7 +1183,6 @@ bool is_valid (const Arrangement_on_surface_2& arr) typedef Arrangement_on_surface_2 Arr; typedef GeomTraits Geometry_traits_2; - typedef typename Geometry_traits_2::Point_2 Point_2; typedef typename Geometry_traits_2::X_monotone_curve_2 X_monotone_curve_2; // Define the sweep-line types: @@ -1200,8 +1198,6 @@ bool is_valid (const Arrangement_on_surface_2& arr) typedef typename Arr::Vertex_const_handle Vertex_const_handle; typedef typename Arr::Isolated_vertex_const_iterator Isolated_vertex_const_iterator; - typedef typename Arr::Ccb_halfedge_const_circulator - Ccb_halfedge_const_circulator; typedef typename Arr::Halfedge_around_vertex_const_circulator Halfedge_around_vertex_const_circulator; @@ -1454,9 +1450,6 @@ OutputIterator zone (Arrangement_on_surface_2& arr, const typename GeomTraits::X_monotone_curve_2& c, OutputIterator oi) { - typedef Arrangement_on_surface_2 - Arrangement_on_surface_2; - // Create a default point-location object and use it to insert the curve. typename TopTraits::Default_point_location_strategy def_pl (arr); @@ -1585,9 +1578,6 @@ template bool do_intersect (Arrangement_on_surface_2& arr, const Curve& c) { - typedef Arrangement_on_surface_2 - Arrangement_on_surface_2; - // Create a default point-location object and use it to insert the curve. typename TopTraits::Default_point_location_strategy def_pl (arr); diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h index 410645ca13e..69957b25131 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h @@ -132,9 +132,6 @@ void prepare_for_sweep (Arrangement& arr, PointOutIter iso_points, const ExTraits * /* ex_tr */) { - typedef typename Arrangement::X_monotone_curve_2 X_monotone_curve_2; - typedef typename Arrangement::Point_2 Point_2; - typedef typename Arrangement::Vertex_iterator Vertex_iterator; typedef typename Arrangement::Edge_iterator Edge_iterator; typedef typename Arrangement::Vertex_handle Vertex_handle; diff --git a/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h b/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h index 356198f1aa9..d1274215545 100644 --- a/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h @@ -154,7 +154,6 @@ public: std::istream & operator>>(std::istream & is, Circular_arc_point_2 &p) { - typedef typename CK::Root_of_2 Root_of_2; typedef typename CK::Root_for_circles_2_2 Root_for_circles_2_2; Root_for_circles_2_2 r; diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h index e93b235e7bc..02cf20ebbdb 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h @@ -68,8 +68,6 @@ namespace CircularFunctors { typename CK::Polynomial_for_circles_2_2 get_equation( const typename CK::Circle_2 & c ) { - typedef typename CK::RT RT; - typedef typename CK::Algebraic_kernel AK; return AK().construct_polynomial_for_circles_2_2_object() diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circular_arc_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circular_arc_2.h index 0ee5812446d..95ab4825265 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circular_arc_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circular_arc_2.h @@ -227,11 +227,11 @@ namespace CircularFunctors { //CGAL_kernel_precondition (A1.is_x_monotone()); //CGAL_kernel_precondition (A2.is_x_monotone()); +#ifdef CGAL_INTERSECTION_MAP_FOR_XMONOTONIC_ARC_WITH_SAME_SUPPORTING_CIRCLE + // intersection found on the map typedef std::vector solutions_container; typedef typename CK::Circular_arc_2 Circular_arc_2; -#ifdef CGAL_INTERSECTION_MAP_FOR_XMONOTONIC_ARC_WITH_SAME_SUPPORTING_CIRCLE - // intersection found on the map solutions_container early_sols; if(Circular_arc_2::template find_intersection< solutions_container > (A1,A2,early_sols)) { @@ -1057,9 +1057,6 @@ template < class CK, class OutputIterator > OutputIterator res ) { typedef typename CK::Circular_arc_2 Circular_arc_2; - typedef typename CK::Circle_2 Circle_2; - typedef typename CK::FT FT; - typedef typename CK::Point_2 Point_2; typedef typename CK::Circular_arc_point_2 Circular_arc_point_2; typedef typename CK::Root_for_circles_2_2 Root_for_circles_2_2; @@ -1320,9 +1317,6 @@ template < class CK, class OutputIterator > OutputIterator res ) { typedef typename CK::Circular_arc_2 Circular_arc_2; - typedef typename CK::Circle_2 Circle_2; - typedef typename CK::FT FT; - typedef typename CK::Point_2 Point_2; typedef std::pair S_pair; @@ -1541,8 +1535,6 @@ advanced_make_xy_monotone( const typename CK::Circular_arc_2 &a, CGAL::Bbox_2 circular_arc_bbox ( const typename CK::Kernel_base::Circular_arc_2 & a) { - typedef typename CK::Root_of_2 Root_of_2; - typedef typename CK::FT FT; typedef CGAL::Interval_nt::Protector IntervalProtector; typedef CGAL::Interval_nt Interval; diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_2.h index 210873eba97..bde982fc978 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_2.h @@ -33,8 +33,6 @@ namespace LinearFunctors { typename CK::Polynomial_1_2 get_equation( const typename CK::Line_2 & L ) { - typedef typename CK::RT RT; - return typename CK::Polynomial_1_2(L.a(),L.b(),L.c()); } diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h index 42e887510c3..43c069ea93d 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h @@ -157,7 +157,6 @@ namespace CircularFunctors { if(A2.supporting_line().is_vertical()) return CGAL::SMALLER; - typedef typename CK::Circular_arc_point_2 Circular_arc_point_2; typedef typename CK::Polynomial_1_2 Polynomial_1_2; typedef typename CK::Root_of_2 Root_of_2; @@ -418,8 +417,7 @@ namespace CircularFunctors { typedef typename CK::Circular_arc_point_2 Circular_arc_point_2; typedef typename CK::Line_arc_2 Line_arc_2; typedef typename CK::Point_2 Point_2; - typedef typename CK::Root_of_2 Root_of_2; - typedef typename CK::Root_for_circles_2_2 Root_for_circles_2_2; + // typedef typename CK::Root_for_circles_2_2 Root_for_circles_2_2; #ifdef CGAL_CK_EXPLOIT_IDENTITY bool a1s_a2s = a1.source().equal_ref(a2.source()); @@ -757,8 +755,6 @@ namespace CircularFunctors { typedef typename CK::Line_arc_2 Line_arc_2; typedef typename CK::Point_2 Point_2; typedef typename CK::Line_2 Line_2; - typedef typename CK::Root_of_2 Root_of_2; - typedef typename CK::Root_for_circles_2_2 Root_for_circles_2_2; if(LinearFunctors::non_oriented_equal(l, la.supporting_line())) { *res++ = make_object(la); @@ -784,7 +780,6 @@ namespace CircularFunctors { { typedef typename CK::Circular_arc_2 Circular_arc_2; typedef typename CK::Circular_arc_point_2 Circular_arc_point_2; - typedef typename CK::Line_2 Line_2; typedef std::vector solutions_container; solutions_container solutions; diff --git a/Conic_2/include/CGAL/ConicHPA2.h b/Conic_2/include/CGAL/ConicHPA2.h index 53245365700..ae340f70c13 100644 --- a/Conic_2/include/CGAL/ConicHPA2.h +++ b/Conic_2/include/CGAL/ConicHPA2.h @@ -617,7 +617,6 @@ std::ostream& operator << ( std::ostream& os, const ConicHPA2<_PT,_DA>& c) template< class _PT, class _DA> std::istream& operator >> ( std::istream& is, ConicHPA2<_PT,_DA>& c) { - typedef ConicHPA2<_PT,_DA> Conic; typedef typename _DA::RT RT; RT r, s, t, u, v, w; diff --git a/Convex_decomposition_3/include/CGAL/convex_decomposition_3.h b/Convex_decomposition_3/include/CGAL/convex_decomposition_3.h index 8512557c688..9f841b55e67 100644 --- a/Convex_decomposition_3/include/CGAL/convex_decomposition_3.h +++ b/Convex_decomposition_3/include/CGAL/convex_decomposition_3.h @@ -37,17 +37,13 @@ template void convex_decomposition_3(Nef_polyhedron& N) { typedef typename Nef_polyhedron::SNC_structure SNC_structure; - typedef typename SNC_structure::Vertex_handle Vertex_handle; typedef typename SNC_structure::Halfedge_handle Halfedge_handle; - typedef typename SNC_structure::SHalfedge_handle SHalfedge_handle; - typedef typename SNC_structure::SHalfedge_iterator SHalfedge_iterator; typedef typename Nef_polyhedron::Point_3 Point_3; typedef typename Nef_polyhedron::Vector_3 Vector_3; typedef typename Nef_polyhedron::Sphere_point Sphere_point; typedef typename Nef_polyhedron::FT FT; typedef typename CGAL::Single_wall_creator Single_wall; - typedef typename CGAL::Single_wall_creator2 Single_wall2; typedef typename CGAL::YVertical_wall_builder YVertical_wall_builder; typedef typename CGAL::Reflex_vertex_searcher Reflex_vertex_searcher; typedef typename CGAL::Ray_hit_generator2 Ray_hit2; diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h index f2b2e09dc41..4da70f0c8e2 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h @@ -41,7 +41,6 @@ ch_graham_andrew_scan( BidirectionalIterator first, OutputIterator result, const Traits& ch_traits) { - typedef typename Traits::Less_xy_2 Less_xy; typedef typename Traits::Point_2 Point_2; typedef typename Traits::Left_turn_2 Left_turn; @@ -129,8 +128,6 @@ ch__ref_graham_andrew_scan( BidirectionalIterator first, OutputIterator& result, const Traits& ch_traits) { - typedef typename Traits::Less_xy_2 Less_xy; - typedef typename Traits::Point_2 Point_2; typedef typename Traits::Left_turn_2 Left_turn; CGAL_ch_precondition_code( @@ -202,9 +199,7 @@ ch_graham_andrew( InputIterator first, OutputIterator result, const Traits& ch_traits) { - typedef typename Traits::Less_xy_2 Less_xy; typedef typename Traits::Point_2 Point_2; - typedef typename Traits::Left_turn_2 Left_turn; typedef typename Traits::Equal_2 Equal_2; Equal_2 equal_points = ch_traits.equal_2_object(); @@ -250,9 +245,7 @@ ch_lower_hull_scan( InputIterator first, OutputIterator result, const Traits& ch_traits) { - typedef typename Traits::Less_xy_2 Less_xy; typedef typename Traits::Point_2 Point_2; - typedef typename Traits::Left_turn_2 Left_turn; typedef typename Traits::Equal_2 Equal_2; Equal_2 equal_points = ch_traits.equal_2_object(); @@ -287,9 +280,7 @@ ch_upper_hull_scan( InputIterator first, OutputIterator result, const Traits& ch_traits) { - typedef typename Traits::Less_xy_2 Less_xy; typedef typename Traits::Point_2 Point_2; - typedef typename Traits::Left_turn_2 Left_turn; typedef typename Traits::Equal_2 Equal_2; Equal_2 equal_points = ch_traits.equal_2_object(); diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h index 7c123df8b97..e4a51132256 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h @@ -90,7 +90,6 @@ is_cw_strongly_convex_2( ForwardIterator first, ForwardIterator last, const Traits& ch_traits) { typedef typename Traits::Less_xy_2 Less_xy; - typedef typename Traits::Left_turn_2 Left_turn; typedef typename Traits::Equal_2 Equal_2; Less_xy smaller_xy = ch_traits.less_xy_2_object(); diff --git a/Convex_hull_3/include/CGAL/convex_hull_3.h b/Convex_hull_3/include/CGAL/convex_hull_3.h index 0ce40842ea7..cb3ec6312b3 100644 --- a/Convex_hull_3/include/CGAL/convex_hull_3.h +++ b/Convex_hull_3/include/CGAL/convex_hull_3.h @@ -475,7 +475,6 @@ ch_quickhull_3_scan(TDS_2& tds, const Traits& traits) { typedef typename TDS_2::Edge Edge; - typedef typename TDS_2::Face_circulator Face_circulator; typedef typename TDS_2::Face_handle Face_handle; typedef typename TDS_2::Vertex_handle Vertex_handle; typedef typename Traits::Point_3 Point_3; @@ -562,9 +561,7 @@ void non_coplanar_quickhull_3(std::list& points, TDS_2& tds, const Traits& traits) { typedef typename Traits::Point_3 Point_3; - typedef typename Traits::Plane_3 Plane_3; - typedef typename TDS_2::Vertex_handle Vertex_handle; typedef typename TDS_2::Face_handle Face_handle; typedef typename TDS_2::Face_iterator Face_iterator; typedef typename std::list::iterator P3_iterator; @@ -639,8 +636,6 @@ public: } void operator()( HDS& hds) { // Postcondition: `hds' is a valid polyhedral surface. - typedef typename HDS::Vertex Vertex; - typedef typename Vertex::Point Point; CGAL::Polyhedron_incremental_builder_3 B( hds, true); Vertex_map vertex_map; @@ -755,7 +750,6 @@ convex_hull_3(InputIterator first, InputIterator beyond, Object& ch_object, const Traits& traits) { typedef typename Traits::Point_3 Point_3; - typedef typename Traits::Plane_3 Plane_3; typedef std::list Point_3_list; typedef typename Point_3_list::iterator P3_iterator; typedef std::pair P3_iterator_pair; @@ -868,7 +862,6 @@ void convex_hull_3(InputIterator first, InputIterator beyond, Object& ch_object) { typedef typename std::iterator_traits::value_type Point_3; - typedef typename Kernel_traits::Kernel K; typedef typename internal::Convex_hull_3::Default_traits_for_Chull_3::type Traits; convex_hull_3(first, beyond, ch_object, Traits()); } @@ -880,7 +873,6 @@ void convex_hull_3(InputIterator first, InputIterator beyond, Polyhedron_3& polyhedron, const Traits& traits) { typedef typename Traits::Point_3 Point_3; - typedef typename Traits::Plane_3 Plane_3; typedef std::list Point_3_list; typedef typename Point_3_list::iterator P3_iterator; diff --git a/Envelope_3/include/CGAL/Envelope_3/Env_plane_traits_3_functions.h b/Envelope_3/include/CGAL/Envelope_3/Env_plane_traits_3_functions.h index 616c3823007..af4bbce85d0 100644 --- a/Envelope_3/include/CGAL/Envelope_3/Env_plane_traits_3_functions.h +++ b/Envelope_3/include/CGAL/Envelope_3/Env_plane_traits_3_functions.h @@ -31,9 +31,6 @@ Object plane_half_plane_proj_intersection(const typename K::Plane_3 &h1, const typename K::Line_2 &l, const K& k) { - typedef typename K::Vector_2 Vector_2; - typedef typename K::Point_2 Point_2; - typedef typename K::Ray_2 Ray_2; typedef typename K::Line_3 Line_3; typedef typename K::Line_2 Line_2; typedef typename K::Plane_3 Plane_3; @@ -92,7 +89,6 @@ typename K::Line_2 project_xy(const typename K::Line_3& l, typedef typename K::Vector_2 Vector_2; typedef typename K::Point_3 Point_3; typedef typename K::Point_2 Point_2; - typedef typename K::Ray_2 Ray_2; Vector_3 vec3 = k.construct_vector_3_object()(l); Vector_2 vec2(vec3.x(), vec3.y()); @@ -157,10 +153,8 @@ Object ray_under_linear_constraint(const typename K::Ray_2& ray, const K& k) { typedef typename K::Ray_2 Ray_2; - typedef typename K::Line_2 Line_2; typedef typename K::Vector_2 Vector_2; typedef typename K::Point_2 Point_2; - typedef typename K::Segment_2 Segment_2; const Point_2& s = k.construct_point_on_2_object()(ray, 0); Oriented_side side = k.oriented_side_2_object()(l, s); diff --git a/Generator/include/CGAL/random_polygon_2.h b/Generator/include/CGAL/random_polygon_2.h index 248bb30249d..6268d710e64 100644 --- a/Generator/include/CGAL/random_polygon_2.h +++ b/Generator/include/CGAL/random_polygon_2.h @@ -47,7 +47,6 @@ OutputIterator random_polygon_2(std::size_t n, OutputIterator result, { typedef typename Traits::Point_2 Point_2; typedef std::vector Vertex_list; - typedef typename Vertex_list::iterator Iterator; Vertex_list vertices; diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h b/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h index 70a180afd92..b9dc6e940ed 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h @@ -739,7 +739,6 @@ namespace HomogeneousKernelFunctors { result_type operator()(const Line_2& l1, const Line_2& l2) const { - typedef typename K::RT RT; if (l1.is_horizontal()) return l2.is_vertical() ? SMALLER : CGAL_NTS sign(l2.a()) * CGAL_NTS sign(l2.b()); @@ -1047,7 +1046,6 @@ namespace HomogeneousKernelFunctors { result_type operator()( const Point_2& p, const Line_2& h) const { - typedef typename K::RT RT; CGAL_kernel_precondition( ! h.is_vertical() ); typename K::Oriented_side ors = h.oriented_side( p ); if ( h.b() < 0 ) diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/include/Qt_Delaunay_stable_subset_2.h b/Kinetic_data_structures/demo/Kinetic_data_structures/include/Qt_Delaunay_stable_subset_2.h index 38da5a62aef..61943524861 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/include/Qt_Delaunay_stable_subset_2.h +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/include/Qt_Delaunay_stable_subset_2.h @@ -84,7 +84,6 @@ protected: { //std::cout << "Drawing del\n"; typedef typename Kinetic_Delaunay::Triangulation Del; - typedef typename Del::Geom_traits::Point_2 Point_key; const Del &tri= kdel_->triangulation(typename Del::Geom_traits::Time(t)); //tri.geom_traits().set_time(typename Del::Geom_traits::Time(t)); w << CGAL::LineWidth(1); diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_moving_points_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_moving_points_2.h index c21dea456ba..c7946ffb395 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_moving_points_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_moving_points_2.h @@ -170,7 +170,6 @@ template void Qt_moving_points_2::draw() const { //std::cout << "Drawing mpt MPT\n"; - typedef typename Traits::Static_kernel::Point_2 P2; typedef typename Traits::Static_kernel::Circle_2 C; typedef typename Traits::Kinetic_kernel::Is_constant IC; IC ic = traits_.kinetic_kernel_object().is_constant_object(); @@ -191,6 +190,7 @@ void Qt_moving_points_2::draw() const } else { w << CGAL::PointSize(std::max BOOST_PREVENT_MACRO_SUBSTITUTION(ptsz_/8, 1)) << CGAL::LineWidth(1); } + // typedef typename Traits::Static_kernel::Point_2 P2; //out << C(P2(0,0), 2) << C(P2(0,0), 1); //out << CGAL::BackgroundColor(CGAL::Color(125,125,125)); diff --git a/Matrix_search/include/CGAL/pierce_rectangles_2.h b/Matrix_search/include/CGAL/pierce_rectangles_2.h index 33bfe963b6b..bf263761fcf 100644 --- a/Matrix_search/include/CGAL/pierce_rectangles_2.h +++ b/Matrix_search/include/CGAL/pierce_rectangles_2.h @@ -492,7 +492,6 @@ two_cover_points( using std::less; typedef typename Traits::FT FT; - typedef typename Traits::Point_2 Point_2; typename Traits::Infinity_distance_2 dist = d.traits.infinity_distance_2_object(); typename Traits::Signed_infinity_distance_2 sdist = diff --git a/Matrix_search/include/CGAL/rectangular_3_center_2.h b/Matrix_search/include/CGAL/rectangular_3_center_2.h index 79a1cde94ba..b153211e06b 100644 --- a/Matrix_search/include/CGAL/rectangular_3_center_2.h +++ b/Matrix_search/include/CGAL/rectangular_3_center_2.h @@ -865,7 +865,6 @@ rectangular_3_center_2_type2( using std::pair; typedef typename Operations::Point Point; - typedef typename Operations::Distance Distance; typedef pair< RandomAccessIterator, RandomAccessIterator > IP; typename Operations::Construct_iso_rectangle_2 diff --git a/Matrix_search/include/CGAL/sorted_matrix_search.h b/Matrix_search/include/CGAL/sorted_matrix_search.h index ab95c20babe..78f12a93b7a 100644 --- a/Matrix_search/include/CGAL/sorted_matrix_search.h +++ b/Matrix_search/include/CGAL/sorted_matrix_search.h @@ -161,9 +161,7 @@ sorted_matrix_search(InputIterator f, InputIterator l, Traits t) typedef Matrix_cell< PaddedMatrix > Cell; typedef std::vector< Cell > Cell_container; typedef typename Cell_container::iterator Cell_iterator; - typedef typename Cell_container::reverse_iterator Cell_reverse_iterator; - - typedef typename Cell_container::size_type size_type ; + // typedef typename Cell_container::reverse_iterator Cell_reverse_iterator; Cell_container active_cells; diff --git a/Mesh_2/include/CGAL/Delaunay_mesh_criteria_2.h b/Mesh_2/include/CGAL/Delaunay_mesh_criteria_2.h index 9a3a4a52a72..9adf47aa3f2 100644 --- a/Mesh_2/include/CGAL/Delaunay_mesh_criteria_2.h +++ b/Mesh_2/include/CGAL/Delaunay_mesh_criteria_2.h @@ -77,9 +77,6 @@ public: typedef typename Geom_traits::Compute_area_2 Compute_area_2; typedef typename Geom_traits::Compute_squared_distance_2 Compute_squared_distance_2; - typedef typename Geom_traits::Construct_triangle_2 - Construct_triangle_2; - typedef typename Geom_traits::FT FT; Compute_area_2 area_2 = traits.compute_area_2_object(); diff --git a/Mesh_2/include/CGAL/Delaunay_mesh_size_criteria_2.h b/Mesh_2/include/CGAL/Delaunay_mesh_size_criteria_2.h index 041a0caf6cd..15b4edcf0de 100644 --- a/Mesh_2/include/CGAL/Delaunay_mesh_size_criteria_2.h +++ b/Mesh_2/include/CGAL/Delaunay_mesh_size_criteria_2.h @@ -114,9 +114,6 @@ public: typedef typename Geom_traits::Compute_area_2 Compute_area_2; typedef typename Geom_traits::Compute_squared_distance_2 Compute_squared_distance_2; - typedef typename Geom_traits::Construct_triangle_2 - Construct_triangle_2; - typedef typename Geom_traits::FT FT; Geom_traits traits; /** @warning traits with data!! */ diff --git a/Mesh_2/include/CGAL/Mesh_2/Clusters.h b/Mesh_2/include/CGAL/Mesh_2/Clusters.h index 9193d8a830c..a14759e126c 100644 --- a/Mesh_2/include/CGAL/Mesh_2/Clusters.h +++ b/Mesh_2/include/CGAL/Mesh_2/Clusters.h @@ -296,9 +296,6 @@ public: { typedef typename Cluster_map::const_iterator Iterator; typedef std::pair Range; - typedef typename Range::first_type Clusters_iterator; - typedef Pair_get_first - Get_first; Range range = cluster_map.equal_range(vh); Iterator first = range.first; diff --git a/Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h b/Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h index 2e4608b8410..14bec453ffd 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h +++ b/Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h @@ -197,8 +197,6 @@ bool Detect_features_in_polyhedra:: is_sharp(const Halfedge_handle& he, FT cos_angle) const { - typedef typename Geom_traits::FT FT; - Facet_handle f1 = he->facet(); Facet_handle f2 = he->opposite()->facet(); if(f1 == NULL || f2 == NULL) diff --git a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h index 0f82f2da606..4605af80ba7 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h +++ b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h @@ -806,8 +806,6 @@ non_adjacent_but_intersect(const Vertex_handle& va, const Vertex_handle& vb) con { if ( ! c3t3_.is_in_complex(va,vb) ) { - typedef typename Gt::Sphere_3 Sphere_3; - typename Gt::Construct_sphere_3 sphere = c3t3_.triangulation().geom_traits().construct_sphere_3_object(); diff --git a/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h b/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h index 2dc73e1762d..800e1768d5e 100644 --- a/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h +++ b/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h @@ -397,7 +397,6 @@ protected: { typedef typename Tr::Vertex_handle Vertex_handle; typedef typename Tr::Cell_handle Cell_handle; - typedef typename Tr::Vertex::Index Index; const Cell_handle& ch = f.first; const int i = f.second; diff --git a/Mesh_3/include/CGAL/Mesh_3/radius_ratio.h b/Mesh_3/include/CGAL/Mesh_3/radius_ratio.h index d7f484071eb..539098e4506 100644 --- a/Mesh_3/include/CGAL/Mesh_3/radius_ratio.h +++ b/Mesh_3/include/CGAL/Mesh_3/radius_ratio.h @@ -34,7 +34,6 @@ radius_ratio(const typename K::Point_3& p0, K k = K()) { typedef typename K::FT FT; - typedef typename K::Point_3 Point_3; typename K::Compute_squared_distance_3 sq_distance = k.compute_squared_distance_3_object(); typename K::Compute_squared_radius_3 comp_sq_circumradius = diff --git a/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h b/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h index 4e6a2067d0f..83fd640a10e 100644 --- a/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h +++ b/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h @@ -569,7 +569,6 @@ is_valid() const const Bare_point& p = it->right->point().point(); const Bare_point& q = it->left->point().point(); - typedef typename Tr::Geom_traits::Sphere_3 Sphere_3; typename Tr::Geom_traits::Construct_sphere_3 sphere = this->triangulation().geom_traits().construct_sphere_3_object(); diff --git a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h index c86af513ea5..f72664a5af2 100644 --- a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h +++ b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h @@ -554,9 +554,6 @@ Polyhedral_mesh_domain_3:: Construct_initial_points::operator()(OutputIterator pts, const int n) const { - typedef boost::optional - AABB_intersection; - typename IGT::Construct_ray_3 ray = IGT().construct_ray_3_object(); typename IGT::Construct_vector_3 vector = IGT().construct_vector_3_object(); diff --git a/Mesh_3/include/CGAL/lloyd_optimize_mesh_3.h b/Mesh_3/include/CGAL/lloyd_optimize_mesh_3.h index 6ee586904b8..b75ebf3568c 100644 --- a/Mesh_3/include/CGAL/lloyd_optimize_mesh_3.h +++ b/Mesh_3/include/CGAL/lloyd_optimize_mesh_3.h @@ -64,7 +64,6 @@ lloyd_optimize_mesh_3_impl(C3T3& c3t3, const double freeze_bound) { typedef typename C3T3::Triangulation Tr; - typedef typename Tr::Geom_traits Gt; typedef Mesh_3::Mesh_sizing_field Sizing; typedef typename Mesh_3::Lloyd_move Move; diff --git a/Mesh_3/include/CGAL/odt_optimize_mesh_3.h b/Mesh_3/include/CGAL/odt_optimize_mesh_3.h index 9585e30d41d..c89ce752cc5 100644 --- a/Mesh_3/include/CGAL/odt_optimize_mesh_3.h +++ b/Mesh_3/include/CGAL/odt_optimize_mesh_3.h @@ -65,7 +65,6 @@ odt_optimize_mesh_3_impl(C3T3& c3t3, const double freeze_ratio) { typedef typename C3T3::Triangulation Tr; - typedef typename Tr::Geom_traits Gt; typedef Mesh_3::Mesh_sizing_field Sizing; typedef typename Mesh_3::Odt_move Move; diff --git a/Mesh_3/include/CGAL/refine_mesh_3.h b/Mesh_3/include/CGAL/refine_mesh_3.h index 5e59356a2b4..edcfe5b4d10 100644 --- a/Mesh_3/include/CGAL/refine_mesh_3.h +++ b/Mesh_3/include/CGAL/refine_mesh_3.h @@ -310,7 +310,6 @@ void refine_mesh_3_impl(C3T3& c3t3, bool reset_c3t3) { typedef Mesh_3::Mesher_3 Mesher; - typedef typename C3T3::Triangulation::Geom_traits Gt; // Reset c3t3 (i.e. remove weights) if needed if ( reset_c3t3 ) diff --git a/Minkowski_sum_2/include/CGAL/offset_polygon_2.h b/Minkowski_sum_2/include/CGAL/offset_polygon_2.h index 546e1fb6389..803ace280a6 100644 --- a/Minkowski_sum_2/include/CGAL/offset_polygon_2.h +++ b/Minkowski_sum_2/include/CGAL/offset_polygon_2.h @@ -150,7 +150,6 @@ inset_polygon_2 (const Polygon_2 Base; typedef Offset_by_convolution_2 Exact_offset_2; - typedef typename Exact_offset_2::Offset_polygon_2 Offset_polygon_2; Base base; Exact_offset_2 exact_offset (base); diff --git a/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h b/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h index 2d4f718d554..e615d1efbdc 100644 --- a/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h +++ b/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h @@ -306,14 +306,13 @@ inline std::ostream& operator << (std::ostream& os, const Residue& p) { } inline std::istream& operator >> (std::istream& is, Residue& p) { - typedef Residue RES; char ch; int prime; is >> p.x(); is >> ch; // read the % is >> prime; // read the prime - CGAL_precondition(prime==RES::get_current_prime()); + CGAL_precondition(prime==Residue::get_current_prime()); return is; } diff --git a/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h b/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h index 946f3313e3e..300075d452b 100644 --- a/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h +++ b/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h @@ -432,8 +432,6 @@ check_integrity_and_topological_planarity(bool faces) const EI(halfedges_begin(),halfedges_end(),'e'); Object_index FI(faces_begin(),faces_end(),'f'); - typedef Halfedge_around_vertex_const_circulator hvc_circulator; - typedef Halfedge_around_face_const_circulator hfc_circulator; Vertex_const_handle vit, vend = phds->vertices_end(); int iso_vert_num=0; /* check the source links of out edges and count isolated vertices */ diff --git a/Nef_3/include/CGAL/Nef_3/K3_tree.h b/Nef_3/include/CGAL/Nef_3/K3_tree.h index c7c36c4725d..54f394ccef8 100644 --- a/Nef_3/include/CGAL/Nef_3/K3_tree.h +++ b/Nef_3/include/CGAL/Nef_3/K3_tree.h @@ -782,10 +782,6 @@ public: typedef typename SNC_structure::Vertex_iterator Vertex_iterator; typedef typename SNC_structure::Halfedge_iterator Halfedge_iterator; typedef typename SNC_structure::Halffacet_iterator Halffacet_iterator; - typedef typename SNC_structure::Halffacet_cycle_iterator - Halffacet_cycle_iterator; - typedef typename SNC_structure::SHalfedge_around_facet_circulator - SHalfedge_around_facet_circulator; CGAL_assertion( W != NULL); Object_list objects; @@ -799,7 +795,11 @@ public: objects.push_back(make_object(Halfedge_handle(e))); CGAL_forall_facets( f, *W) { #ifdef CGAL_NEF3_TRIANGULATE_FACETS - + typedef typename SNC_structure::SHalfedge_around_facet_circulator + SHalfedge_around_facet_circulator; + typedef typename SNC_structure::Halffacet_cycle_iterator + Halffacet_cycle_iterator; + Halffacet_cycle_iterator fci = f->facet_cycles_begin(); CGAL_assertion(fci.is_shalfedge()); SHalfedge_around_facet_circulator safc(fci); diff --git a/Nef_3/include/CGAL/Nef_3/SNC_constructor.h b/Nef_3/include/CGAL/Nef_3/SNC_constructor.h index 4d96ec6c528..3bbc14028ee 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_constructor.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_constructor.h @@ -498,7 +498,6 @@ public: Vertex_handle create_from_plane(const Plane_3& pl, const Point_3& p, const Mark& bnd, const Mark& in, const Mark& out) const { - typedef typename CGAL::SNC_const_decorator SNC_const_decorator; Vertex_handle v = this->sncp()->new_vertex( p, bnd); v->point() = p; Sphere_circle c(pl); // circle through origin parallel to h diff --git a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h index 031349c7d2c..d1a0659e55a 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h @@ -712,7 +712,6 @@ class Geometry_io { void print_point(std::ostream& out, const CGAL::Point_3 p) { typedef Fraction_traits FracTraits; typedef std::vector NV; - typedef typename NV::iterator NV_iter; typename FracTraits::Numerator_type num; typename FracTraits::Denominator_type denom; @@ -745,7 +744,6 @@ class Geometry_io { typedef Fraction_traits FracTraits; typedef typename FracTraits::Numerator_type NumType; typedef std::vector NV; - typedef typename NV::iterator NV_iter; typename FracTraits::Numerator_type num; typename FracTraits::Denominator_type denom; @@ -774,7 +772,6 @@ class Geometry_io { void print_plane(std::ostream& out, const CGAL::Plane_3 p) { typedef Fraction_traits FracTraits; typedef std::vector NV; - typedef typename NV::iterator NV_iter; typename FracTraits::Numerator_type num; typename FracTraits::Denominator_type denom; diff --git a/Nef_3/include/CGAL/Nef_3/polyhedron_3_to_nef_3.h b/Nef_3/include/CGAL/Nef_3/polyhedron_3_to_nef_3.h index dabe13acf28..7485c2db142 100644 --- a/Nef_3/include/CGAL/Nef_3/polyhedron_3_to_nef_3.h +++ b/Nef_3/include/CGAL/Nef_3/polyhedron_3_to_nef_3.h @@ -179,7 +179,6 @@ void polyhedron_3_to_nef_3(Polyhedron_& P, SNC_structure& S) typedef Polyhedron_ Polyhedron; typedef typename Polyhedron::Facet::Plane_3 Plane; typedef typename Polyhedron::Traits::Kernel Kernel; - typedef typename SNC_structure::SNC_decorator SNC_decorator; typedef typename SNC_structure::SM_decorator SM_decorator; typedef typename SNC_structure::Vertex_handle Vertex_handle; typedef typename SNC_structure::SVertex_handle SVertex_handle; @@ -187,7 +186,6 @@ void polyhedron_3_to_nef_3(Polyhedron_& P, SNC_structure& S) typedef typename SNC_structure::SFace_handle SFace_handle; typedef typename SNC_structure::Point_3 Point_3; typedef typename SNC_structure::Sphere_point Sphere_point; - typedef typename SNC_structure::Sphere_segment Sphere_segment; typedef typename SNC_structure::Sphere_circle Sphere_circle; typedef typename Polyhedron::Halfedge_around_vertex_const_circulator diff --git a/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h b/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h index 6eaadeaaeb0..cc94a91d4f6 100644 --- a/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h +++ b/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h @@ -158,16 +158,10 @@ bool projected_vertex_cycle_to_nef_3 (typename Nef_3::SNC_structure &snc, typedef typename SNC_structure::SHalfedge_handle SHalfedge_handle; typedef typename SNC_structure::SFace_handle SFace_handle; - typedef typename SNC_structure::Kernel Kernel; - typedef typename SNC_structure::Point_3 Point_3; typedef typename std::pair Point_pair; typedef Compare_cpte Compare_edge; - typedef CGAL::SNC_point_locator_by_spatial_subdivision - > Point_locator; - typedef typename SNC_structure::Items Items; - typedef CGAL::SNC_constructor SNC_constructor; // declarations and defaults II v_it, v_pred_it; diff --git a/Nef_S2/include/CGAL/Nef_S2/Normalizing.h b/Nef_S2/include/CGAL/Nef_S2/Normalizing.h index 78327116903..ffec451d27d 100644 --- a/Nef_S2/include/CGAL/Nef_S2/Normalizing.h +++ b/Nef_S2/include/CGAL/Nef_S2/Normalizing.h @@ -291,8 +291,7 @@ class Normalizing { typedef typename R::FT FT; typedef Fraction_traits FracTraits; typedef std::vector NV; - typedef typename NV::iterator NV_iter; - + typename FracTraits::Numerator_type num; typename FracTraits::Denominator_type denom; typename FracTraits::Decompose decomposer; diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h b/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h index b674c70f59a..531a7018eaf 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h @@ -294,8 +294,6 @@ check_integrity_and_topological_planarity(bool faces) const EI(shalfedges_begin(),shalfedges_end(),'e'); Object_index FI(sfaces_begin(),sfaces_end(),'f'); - typedef SHalfedge_around_svertex_const_circulator hvc_circulator; - typedef SHalfedge_around_sface_const_circulator hfc_circulator; SVertex_const_handle v; int iso_vert_num=0; /* check the source links of out edges and count isolated vertices */ diff --git a/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h b/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h index 6ceb3518a73..fbb8f81ff20 100644 --- a/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h +++ b/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h @@ -135,7 +135,6 @@ OutputIterator partition_approx_convex_2(InputIterator first, typedef Triangulation_indirect_traits_2 Gt; typedef Constrained_triangulation_2 Constrained_tri_2; - typedef typename Constrained_tri_2::Edge_iterator Edge_iterator; typedef typename Constrained_tri_2::Edge_circulator Edge_circulator; typedef typename Constrained_tri_2::Vertex_iterator Tri_vertex_iterator; typedef typename Constrained_tri_2::Vertex_handle Vertex_handle; diff --git a/Partition_2/include/CGAL/Partition_2/partition_greene_approx_convex_2.h b/Partition_2/include/CGAL/Partition_2/partition_greene_approx_convex_2.h index ed22f628f78..55bf5186f72 100644 --- a/Partition_2/include/CGAL/Partition_2/partition_greene_approx_convex_2.h +++ b/Partition_2/include/CGAL/Partition_2/partition_greene_approx_convex_2.h @@ -361,7 +361,6 @@ void change_top_chain(Polygon& polygon, { std::copy(new_point_ref, stack.before_front(), std::back_inserter(new_polygon)); - typedef typename Polygon::iterator iterator; erase_vertices(top_chain.front(), stack.front(), polygon, update_required); top_chain.push_front(stack.front()); @@ -801,7 +800,6 @@ OutputIterator partition_greene_approx_convex_2(InputIterator first, { if (first == beyond) return result; - typedef typename Traits::Point_2 Point_2; typedef typename Traits::Polygon_2 Polygon_2; #if defined(CGAL_PARTITION_NO_POSTCONDITIONS) || \ diff --git a/Partition_2/include/CGAL/Partition_2/partition_optimal_convex_2.h b/Partition_2/include/CGAL/Partition_2/partition_optimal_convex_2.h index 97d05a90213..c5de9916a5a 100644 --- a/Partition_2/include/CGAL/Partition_2/partition_optimal_convex_2.h +++ b/Partition_2/include/CGAL/Partition_2/partition_optimal_convex_2.h @@ -205,7 +205,6 @@ bool collinearly_visible(unsigned int edge_num1, unsigned int e_num, const Polygon& polygon, const Traits& traits) { - typedef typename Polygon::size_type size_type; typedef typename Traits::Orientation_2 Orientation_2; Orientation_2 orientation = traits.orientation_2_object(); @@ -447,7 +446,6 @@ void partition_opt_cvx_preprocessing(Polygon& polygon, { typedef typename Polygon::size_type size_type; - typedef typename Polygon::iterator Vertex_iterator; typedef Vertex_visibility_graph_2 Vis_graph; typedef typename Traits::Point_2 Point_2; typedef std::pair Point_pair; diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h index 0d93bc25728..4d9b1720a0f 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h @@ -2532,7 +2532,6 @@ inline void Periodic_3_triangulation_3::periodic_remove(Vertex_handle v, // with the facet just behind typedef std::map Vertex_triple_Facet_map; typedef PointRemover Point_remover; - typedef typename Point_remover::TDSE TDSE; typedef typename Point_remover::CellE_handle CellE_handle; typedef typename Point_remover::VertexE_handle VertexE_handle; typedef typename Point_remover::FacetE FacetE; @@ -2541,8 +2540,6 @@ inline void Periodic_3_triangulation_3::periodic_remove(Vertex_handle v, Finite_cellsE_iterator; typedef typename Point_remover::Vertex_triple_FacetE_map Vertex_triple_FacetE_map; - typedef typename Point_remover::Vertex_triple_FacetE_map_it - Vertex_triple_FacetE_map_it; // First compute the hole and its boundary vertices. std::vector hole; @@ -3020,7 +3017,6 @@ Periodic_3_triangulation_3::convert_to_27_sheeted_covering() { Virtual_cell_map; typedef std::map > Virtual_cell_reverse_map; - typedef typename Virtual_cell_map::const_iterator VCMIT; typedef typename Virtual_cell_reverse_map::const_iterator VCRMIT; Virtual_cell_map virtual_cells; @@ -3555,8 +3551,6 @@ operator<< (std::ostream& os,const Periodic_3_triangulation_3 &tr) typedef typename Triangulation::Vertex_iterator Vertex_iterator; typedef typename Triangulation::Cell_handle Cell_handle; typedef typename Triangulation::Cell_iterator Cell_iterator; - typedef typename Triangulation::Edge_iterator Edge_iterator; - typedef typename Triangulation::Facet_iterator Facet_iterator; typedef typename Triangulation::Covering_sheets Covering_sheets; typedef typename Triangulation::Offset Offset; typedef typename Triangulation::Virtual_vertex_map_it Virtual_vertex_map_it; @@ -3754,9 +3748,9 @@ operator==(const Periodic_3_triangulation_3 &t1, typedef typename Periodic_3_triangulation_3::Point Point; typedef typename Periodic_3_triangulation_3::Offset Offset; - typedef typename Periodic_3_triangulation_3 - ::Geometric_traits::Compare_xyz_3 Compare_xyz_3; - + + // typedef typename Periodic_3_triangulation_3 + // ::Geometric_traits::Compare_xyz_3 Compare_xyz_3; // Compare_xyz_3 cmp1 = t1.geom_traits().compare_xyz_3_object(); // Compare_xyz_3 cmp2 = t2.geom_traits().compare_xyz_3_object(); diff --git a/Point_set_processing_3/include/CGAL/compute_average_spacing.h b/Point_set_processing_3/include/CGAL/compute_average_spacing.h index 5590016e650..3c253d74f3e 100644 --- a/Point_set_processing_3/include/CGAL/compute_average_spacing.h +++ b/Point_set_processing_3/include/CGAL/compute_average_spacing.h @@ -56,8 +56,6 @@ compute_average_spacing(const typename Kernel::Point_3& query, ///< 3D point who // basic geometric types typedef typename Kernel::FT FT; typedef typename Kernel::Point_3 Point; - typedef typename Kernel::Plane_3 Plane; - typedef typename Kernel::Vector_3 Vector; // types for K nearest neighbors search typedef Search_traits_3 Tree_traits; diff --git a/Point_set_processing_3/include/CGAL/jet_estimate_normals.h b/Point_set_processing_3/include/CGAL/jet_estimate_normals.h index d4a3d8f1c9d..8821033bdb8 100644 --- a/Point_set_processing_3/include/CGAL/jet_estimate_normals.h +++ b/Point_set_processing_3/include/CGAL/jet_estimate_normals.h @@ -61,7 +61,6 @@ jet_estimate_normal(const typename Kernel::Point_3& query, ///< point to compute { // basic geometric types typedef typename Kernel::Point_3 Point; - typedef typename Kernel::Vector_3 Vector; // types for K nearest neighbors search typedef typename CGAL::Search_traits_3 Tree_traits; diff --git a/Point_set_processing_3/include/CGAL/mst_orient_normals.h b/Point_set_processing_3/include/CGAL/mst_orient_normals.h index 0f13d983b80..fe6d80853bc 100644 --- a/Point_set_processing_3/include/CGAL/mst_orient_normals.h +++ b/Point_set_processing_3/include/CGAL/mst_orient_normals.h @@ -420,10 +420,6 @@ create_mst_graph( // Bring private stuff to scope using namespace internal; - // Input points types - typedef typename boost::property_traits::value_type Point; - typedef typename boost::property_traits::value_type Vector; - // Riemannian_graph types typedef internal::Riemannian_graph Riemannian_graph; typedef typename boost::property_map::const_type Riemannian_graph_weight_map; @@ -535,8 +531,6 @@ mst_orient_normals( // Input points types typedef typename std::iterator_traits::value_type Enriched_point; // actual type of input points - typedef typename boost::property_traits::value_type Vector; - // Property map ForwardIterator -> index typedef Index_property_map IndexPMap; diff --git a/Point_set_processing_3/include/CGAL/pca_estimate_normals.h b/Point_set_processing_3/include/CGAL/pca_estimate_normals.h index 31cee85f420..8a9db097ef5 100644 --- a/Point_set_processing_3/include/CGAL/pca_estimate_normals.h +++ b/Point_set_processing_3/include/CGAL/pca_estimate_normals.h @@ -62,7 +62,6 @@ pca_estimate_normal(const typename Kernel::Point_3& query, ///< point to compute // basic geometric types typedef typename Kernel::Point_3 Point; typedef typename Kernel::Plane_3 Plane; - typedef typename Kernel::Vector_3 Vector; // types for K nearest neighbors search typedef typename CGAL::Search_traits_3 Tree_traits; diff --git a/Point_set_processing_3/include/CGAL/remove_outliers.h b/Point_set_processing_3/include/CGAL/remove_outliers.h index 6ae70f9fdb6..b528695c097 100644 --- a/Point_set_processing_3/include/CGAL/remove_outliers.h +++ b/Point_set_processing_3/include/CGAL/remove_outliers.h @@ -146,7 +146,6 @@ remove_outliers( typedef typename CGAL::Search_traits_3 Tree_traits; typedef typename CGAL::Orthogonal_k_neighbor_search Neighbor_search; typedef typename Neighbor_search::Tree Tree; - typedef typename Neighbor_search::iterator Search_iterator; // precondition: at least one element in the container. // to fix: should have at least three distinct points diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp index cf0ad1d1a93..b3449906d74 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp @@ -289,8 +289,6 @@ Scene_item* cgal_code_mesh_3(const Polyhedron* pMesh, // remesh - typedef Tr::Geom_traits GT; - // Set mesh criteria Facet_criteria facet_criteria(angle, sizing, approx); // angle, size, approximation Cell_criteria cell_criteria(4, tets_sizing); // radius-edge ratio, size diff --git a/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp b/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp index ed76937449d..e8fff1c38c4 100644 --- a/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp @@ -17,7 +17,6 @@ Scene_combinatorial_map_item* Scene_combinatorial_map_item::clone() const{return Kernel::Vector_3 Scene_combinatorial_map_item::compute_face_normal(Combinatorial_map_3::Dart_const_handle adart) const { typedef Combinatorial_map_3::Dart_of_orbit_const_range<1> Dart_in_facet_range; - typedef Kernel::Point_3 Point_3; typedef Kernel::Vector_3 Vector_3; Vector_3 normal = CGAL::NULL_VECTOR; diff --git a/Polyhedron/include/CGAL/internal/corefinement/Polyhedron_subset_extraction.h b/Polyhedron/include/CGAL/internal/corefinement/Polyhedron_subset_extraction.h index eb7d4e1c33f..e02818e21ea 100644 --- a/Polyhedron/include/CGAL/internal/corefinement/Polyhedron_subset_extraction.h +++ b/Polyhedron/include/CGAL/internal/corefinement/Polyhedron_subset_extraction.h @@ -169,7 +169,6 @@ void extract_connected_components(const Polyhedron& P,const Adjacency_criterium& typedef typename Polyhedron::Facet_const_handle Facet_const_handle; typedef ::CGAL::Union_find UF; typedef typename UF::handle UF_handle; - typedef typename UF::iterator UF_iterator; typedef std::map,Compare_handle_ptr > Result; typedef std::map > Facet_to_handle_map; diff --git a/Polyhedron/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h b/Polyhedron/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h index ae55dfba813..64a80ac2b1f 100644 --- a/Polyhedron/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h +++ b/Polyhedron/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h @@ -492,8 +492,6 @@ void sew_2_marked_darts( Combinatorial_map_3& final_map, const std::pair& indices, const std::pair& polyline_info) { - typedef boost::optional O_Dart_handle; - CGAL_precondition( dart_1->is_free(2) ); CGAL_precondition( dart_2->is_free(2) ); CGAL_precondition( final_map.is_marked(dart_1,mark_index) ); @@ -1836,7 +1834,6 @@ public: typedef typename Polyhedron::Facet_const_handle Facet_const_handle; typedef ::CGAL::Union_find UF; typedef typename UF::handle UF_handle; - typedef typename UF::iterator UF_iterator; typedef std::map,internal::Compare_handle_ptr > Result; typedef std::map > Facet_to_handle_map; diff --git a/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_algorithm_M.h b/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_algorithm_M.h index 59d014d933d..c63efc7b0e2 100644 --- a/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_algorithm_M.h +++ b/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_algorithm_M.h @@ -66,10 +66,7 @@ Polynomial modular_gcd_utcf_algorithm_M( timer_init.start(); #endif typedef Polynomial Poly; - typedef Polynomial_traits_d PT; - typedef typename PT::Innermost_coefficient_type IC; - // will paly the role of content typedef typename CGAL::Scalar_factor_traits::Scalar Scalar; diff --git a/Polynomial/include/CGAL/Polynomial/polynomial_gcd_implementations.h b/Polynomial/include/CGAL/Polynomial/polynomial_gcd_implementations.h index 059b82e6115..b72a57db85f 100644 --- a/Polynomial/include/CGAL/Polynomial/polynomial_gcd_implementations.h +++ b/Polynomial/include/CGAL/Polynomial/polynomial_gcd_implementations.h @@ -38,7 +38,6 @@ inline Polynomial gcd_utcf_UFD( Polynomial p1, Polynomial p2 ) { - typedef CGAL::Polynomial_traits_d > PT; // implemented using the subresultant algorithm for gcd computation // see [Cohen, 1993], algorithm 3.3.1 // handle trivial cases diff --git a/Polynomial/include/CGAL/Polynomial/subresultants.h b/Polynomial/include/CGAL/Polynomial/subresultants.h index 3f65194b30e..b0f6f47240b 100644 --- a/Polynomial/include/CGAL/Polynomial/subresultants.h +++ b/Polynomial/include/CGAL/Polynomial/subresultants.h @@ -39,7 +39,6 @@ namespace CGAL { typename Polynomial_traits_d::Polynomial_d B, typename Polynomial_traits_d::Polynomial_d& C) { - typedef typename Polynomial_traits_d::Polynomial_d Polynomial; typedef typename Polynomial_traits_d::Coefficient_type NT; typename CGAL::Algebraic_structure_traits::Integral_division idiv; diff --git a/Polynomial/include/CGAL/Polynomial_traits_d.h b/Polynomial/include/CGAL/Polynomial_traits_d.h index 7c2f371b04e..4f75d270232 100644 --- a/Polynomial/include/CGAL/Polynomial_traits_d.h +++ b/Polynomial/include/CGAL/Polynomial_traits_d.h @@ -1660,7 +1660,6 @@ struct Construct_innermost_coefficient_const_iterator_range typedef std::iterator_traits ITT; typedef typename ITT::value_type value_type; typedef Coercion_traits CT; - typedef typename CT::Type Type; typename PTC::Substitute_homogeneous subsh; diff --git a/Principal_component_analysis/include/CGAL/PCA_util.h b/Principal_component_analysis/include/CGAL/PCA_util.h index b7c8da16e9d..2363b3842c6 100644 --- a/Principal_component_analysis/include/CGAL/PCA_util.h +++ b/Principal_component_analysis/include/CGAL/PCA_util.h @@ -97,8 +97,6 @@ assemble_covariance_matrix_3(InputIterator first, const CGAL::Dimension_tag<2>&) { typedef typename K::FT FT; - typedef typename K::Point_3 Point; - typedef typename K::Vector_3 Vector; typedef typename K::Triangle_3 Triangle; typedef typename CGAL::Linear_algebraCd LA; typedef typename LA::Matrix Matrix; @@ -176,8 +174,6 @@ assemble_covariance_matrix_3(InputIterator first, const CGAL::Dimension_tag<3>&) { typedef typename K::FT FT; - typedef typename K::Point_3 Point; - typedef typename K::Vector_3 Vector; typedef typename K::Iso_cuboid_3 Iso_cuboid; typedef typename CGAL::Linear_algebraCd LA; typedef typename LA::Matrix Matrix; @@ -263,8 +259,6 @@ assemble_covariance_matrix_3(InputIterator first, const CGAL::Dimension_tag<2>&) { typedef typename K::FT FT; - typedef typename K::Point_3 Point; - typedef typename K::Vector_3 Vector; typedef typename K::Iso_cuboid_3 Iso_cuboid; typedef typename CGAL::Linear_algebraCd LA; typedef typename LA::Matrix Matrix; @@ -358,8 +352,6 @@ assemble_covariance_matrix_3(InputIterator first, const CGAL::Dimension_tag<3>&) { typedef typename K::FT FT; - typedef typename K::Point_3 Point; - typedef typename K::Vector_3 Vector; typedef typename K::Sphere_3 Sphere; typedef typename CGAL::Linear_algebraCd LA; typedef typename LA::Matrix Matrix; @@ -442,8 +434,6 @@ assemble_covariance_matrix_3(InputIterator first, const CGAL::Dimension_tag<2>&) { typedef typename K::FT FT; - typedef typename K::Point_3 Point; - typedef typename K::Vector_3 Vector; typedef typename K::Sphere_3 Sphere; typedef typename CGAL::Linear_algebraCd LA; typedef typename LA::Matrix Matrix; @@ -528,8 +518,6 @@ assemble_covariance_matrix_3(InputIterator first, const CGAL::Dimension_tag<3>&) { typedef typename K::FT FT; - typedef typename K::Point_3 Point; - typedef typename K::Vector_3 Vector; typedef typename K::Tetrahedron_3 Tetrahedron; typedef typename CGAL::Linear_algebraCd LA; typedef typename LA::Matrix Matrix; @@ -615,8 +603,6 @@ assemble_covariance_matrix_3(InputIterator first, const CGAL::Dimension_tag<1>&) { typedef typename K::FT FT; - typedef typename K::Point_3 Point; - typedef typename K::Vector_3 Vector; typedef typename K::Segment_3 Segment; typedef typename CGAL::Linear_algebraCd LA; typedef typename LA::Matrix Matrix; @@ -694,7 +680,6 @@ fitting_plane_3(const typename K::FT covariance[6], // covariance matrix const K& ) // kernel { typedef typename K::FT FT; - typedef typename K::Point_3 Point; typedef typename K::Plane_3 Plane; typedef typename K::Vector_3 Vector; @@ -736,7 +721,6 @@ fitting_line_3(const typename K::FT covariance[6], // covariance matrix const K&) // kernel { typedef typename K::FT FT; - typedef typename K::Point_3 Point; typedef typename K::Line_3 Line; typedef typename K::Vector_3 Vector; diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_circles_2.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_circles_2.h index a78d73b49d6..aa57977d187 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_circles_2.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_circles_2.h @@ -54,7 +54,6 @@ linear_least_squares_fitting_2(InputIterator first, // types typedef typename K::FT FT; typedef typename K::Line_2 Line; - typedef typename K::Point_2 Point; typedef typename K::Vector_2 Vector; typedef typename K::Circle_2 Circle; typedef typename CGAL::Linear_algebraCd LA; @@ -163,7 +162,6 @@ linear_least_squares_fitting_2(InputIterator first, // types typedef typename K::FT FT; typedef typename K::Line_2 Line; - typedef typename K::Point_2 Point; typedef typename K::Vector_2 Vector; typedef typename K::Circle_2 Circle; typedef typename CGAL::Linear_algebraCd LA; diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_cuboids_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_cuboids_3.h index 18804c8b106..6832bae13df 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_cuboids_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_cuboids_3.h @@ -109,7 +109,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<1>& tag) { - typedef typename K::FT FT; typedef typename K::Segment_3 Segment; typedef typename K::Iso_cuboid_3 Iso_cuboid; @@ -153,7 +152,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<0>& tag) { - typedef typename K::FT FT; typedef typename K::Point_3 Point; typedef typename K::Iso_cuboid_3 Iso_cuboid; @@ -254,7 +252,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<1>& tag) { - typedef typename K::FT FT; typedef typename K::Segment_3 Segment; typedef typename K::Iso_cuboid_3 Iso_cuboid; @@ -298,7 +295,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<0>& tag) { - typedef typename K::FT FT; typedef typename K::Point_3 Point; typedef typename K::Iso_cuboid_3 Iso_cuboid; diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_points_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_points_3.h index 1f65783b091..b4459bad20d 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_points_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_points_3.h @@ -48,8 +48,6 @@ linear_least_squares_fitting_3(InputIterator first, { typedef typename K::FT FT; typedef typename K::Point_3 Point; - typedef typename K::Plane_3 Plane; - typedef typename K::Vector_3 Vector; // precondition: at least one element in the container. CGAL_precondition(first != beyond); @@ -82,8 +80,6 @@ linear_least_squares_fitting_3(InputIterator first, { typedef typename K::FT FT; typedef typename K::Point_3 Point; - typedef typename K::Line_3 Line; - typedef typename K::Vector_3 Vector; // precondition: at least one element in the container. CGAL_precondition(first != beyond); diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_rectangles_2.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_rectangles_2.h index 332b29632b5..7086dcc0fd2 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_rectangles_2.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_rectangles_2.h @@ -54,12 +54,10 @@ linear_least_squares_fitting_2(InputIterator first, // types typedef typename K::FT FT; typedef typename K::Line_2 Line; - typedef typename K::Point_2 Point; typedef typename K::Vector_2 Vector; typedef typename K::Iso_rectangle_2 Iso_rectangle; typedef typename CGAL::Linear_algebraCd LA; typedef typename LA::Matrix Matrix; - typedef typename K::Segment_2 Segment_2; // precondition: at least one element in the container. CGAL_precondition(first != beyond); diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_2.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_2.h index 13cca1e0e40..e076e8b166b 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_2.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_2.h @@ -54,7 +54,6 @@ linear_least_squares_fitting_2(InputIterator first, // types typedef typename K::FT FT; typedef typename K::Line_2 Line; - typedef typename K::Point_2 Point; typedef typename K::Vector_2 Vector; typedef typename K::Segment_2 Segment; typedef typename CGAL::Linear_algebraCd LA; diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_3.h index 1f0a10fb518..34e7356b253 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_3.h @@ -75,7 +75,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<0>& tag) { - typedef typename K::FT FT; typedef typename K::Segment_3 Segment; typedef typename K::Point_3 Point; @@ -139,7 +138,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<0>& tag) { - typedef typename K::FT FT; typedef typename K::Segment_3 Segment; typedef typename K::Point_3 Point; diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_tetrahedra_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_tetrahedra_3.h index a2b7a73c563..6dc6be35b80 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_tetrahedra_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_tetrahedra_3.h @@ -77,7 +77,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<2>& tag) { - typedef typename K::FT FT; typedef typename K::Tetrahedron_3 Tetrahedron; typedef typename K::Triangle_3 Triangle; @@ -113,7 +112,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<1>& tag) { - typedef typename K::FT FT; typedef typename K::Tetrahedron_3 Tetrahedron; typedef typename K::Segment_3 Segment; @@ -151,7 +149,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<0>& tag) { - typedef typename K::FT FT; typedef typename K::Tetrahedron_3 Tetrahedron; typedef typename K::Point_3 Point; @@ -217,7 +214,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<2>& tag) { - typedef typename K::FT FT; typedef typename K::Tetrahedron_3 Tetrahedron; typedef typename K::Triangle_3 Triangle; @@ -253,7 +249,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<1>& tag) { - typedef typename K::FT FT; typedef typename K::Tetrahedron_3 Tetrahedron; typedef typename K::Segment_3 Segment; @@ -291,7 +286,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<0>& tag) { - typedef typename K::FT FT; typedef typename K::Tetrahedron_3 Tetrahedron; typedef typename K::Point_3 Point; diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_2.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_2.h index 8baff3d08ff..509a9d20136 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_2.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_2.h @@ -56,7 +56,6 @@ linear_least_squares_fitting_2(InputIterator first, // types typedef typename Kernel::FT FT; typedef typename Kernel::Line_2 Line; - typedef typename Kernel::Point_2 Point; typedef typename Kernel::Vector_2 Vector; typedef typename Kernel::Triangle_2 Triangle; typedef typename CGAL::Linear_algebraCd LA; diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_3.h index 4d9f441dcd0..835756c6f49 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_3.h @@ -74,7 +74,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<1>& tag) { - typedef typename K::FT FT; typedef typename K::Triangle_3 Triangle; typedef typename K::Segment_3 Segment; @@ -109,7 +108,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<0>& tag) { - typedef typename K::FT FT; typedef typename K::Triangle_3 Triangle; typedef typename K::Point_3 Point; @@ -174,7 +172,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<1>& tag) { - typedef typename K::FT FT; typedef typename K::Triangle_3 Triangle; typedef typename K::Segment_3 Segment; @@ -209,7 +206,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<0>& tag) { - typedef typename K::FT FT; typedef typename K::Triangle_3 Triangle; typedef typename K::Point_3 Point; diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_Nef_2.h b/Qt_widget/include/CGAL/IO/Qt_widget_Nef_2.h index 101701bbeba..0530101b297 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_Nef_2.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_Nef_2.h @@ -87,32 +87,17 @@ template CGAL::Qt_widget& operator<<(CGAL::Qt_widget& ws, const Nef_polyhedron_2& P) { typedef Nef_polyhedron_2 Polyhedron; - typedef typename T::RT RT; typedef typename T::Standard_RT Standard_RT; typedef typename T::Standard_segment_2 Standard_segment_2; - typedef typename T::Standard_line_2 - Standard_line_2; typedef typename T::Standard_point_2 Standard_point_2; typedef typename Polyhedron::Explorer TExplorer; typedef typename TExplorer::Halfedge_around_face_const_circulator Halfedge_around_face_const_circulator; - typedef typename TExplorer::Hole_const_iterator - Hole_const_iterator; - typedef typename TExplorer::Isolated_vertex_const_iterator - Isolated_vertex_const_iterator; - typedef typename TExplorer::Ray Ray; typedef typename TExplorer::Point Point; - typedef typename TExplorer::Vertex_const_handle - Vertex_const_handle; - typedef typename TExplorer::Halfedge_const_handle - Halfedge_const_handle; - typedef typename TExplorer::Face_const_handle - Face_const_handle; - typedef typename TExplorer::Vertex_const_iterator Vertex_const_iterator; typedef typename TExplorer::Halfedge_const_iterator @@ -198,6 +183,8 @@ CGAL::Qt_widget& operator<<(CGAL::Qt_widget& ws, const Nef_polyhedron_2& P) ws.get_painter().drawPolygon(array); ws.setRasterOp(old_raster); /* + typedef typename TExplorer::Isolated_vertex_const_iterator + Isolated_vertex_const_iterator; Isolated_vertex_const_iterator iv_it; for (iv_it = D.isolated_vertices_begin(fit); iv_it != D.isolated_vertices_end(fit); ++iv_it) { diff --git a/Ridges_3/include/CGAL/PolyhedralSurf_neighbors.h b/Ridges_3/include/CGAL/PolyhedralSurf_neighbors.h index 7b2794b5d58..48ae880e350 100644 --- a/Ridges_3/include/CGAL/PolyhedralSurf_neighbors.h +++ b/Ridges_3/include/CGAL/PolyhedralSurf_neighbors.h @@ -149,7 +149,6 @@ compute_one_ring(const Vertex_const_handle v, std::list &contour, FT &OneRingSize) { - typedef typename std::list::const_iterator list_it; vertex_neigh.push_back(v); Halfedge_around_vertex_const_circulator he_circ = v->vertex_begin(), he_end = he_circ; diff --git a/SearchStructures/examples/RangeSegmentTrees/segment_tree_1.cpp b/SearchStructures/examples/RangeSegmentTrees/segment_tree_1.cpp index ae18f536401..42e10abd101 100644 --- a/SearchStructures/examples/RangeSegmentTrees/segment_tree_1.cpp +++ b/SearchStructures/examples/RangeSegmentTrees/segment_tree_1.cpp @@ -14,7 +14,6 @@ typedef CGAL::Segment_tree_1 SSegment_tree_1_type; int main() { typedef CGAL::Tree_traits_1::Interval Interval; - typedef CGAL::Tree_traits_1::Key Key; // definition of the one-dimensional segment tree std::list InputList, OutputList, N; diff --git a/Skin_surface_3/include/CGAL/Skin_surface_base_3.h b/Skin_surface_3/include/CGAL/Skin_surface_base_3.h index c554c55b38d..4f821ed01da 100644 --- a/Skin_surface_3/include/CGAL/Skin_surface_base_3.h +++ b/Skin_surface_3/include/CGAL/Skin_surface_base_3.h @@ -498,7 +498,6 @@ construct_bounding_box() { typedef typename Regular::Finite_vertices_iterator Finite_vertices_iterator; typedef typename Regular::Geom_traits GT; - typedef typename GT::Bare_point Point; typedef typename GT::Point Weighted_point; typedef typename GT::FT FT; diff --git a/Snap_rounding_2/include/CGAL/Snap_rounding_2.h b/Snap_rounding_2/include/CGAL/Snap_rounding_2.h index 8498827d63b..05edac9231a 100644 --- a/Snap_rounding_2/include/CGAL/Snap_rounding_2.h +++ b/Snap_rounding_2/include/CGAL/Snap_rounding_2.h @@ -527,7 +527,6 @@ find_hot_pixels_and_create_kd_trees(NT pixel_size, typedef std::pair Point_hot_pixel_pair; typedef typename std::list::iterator Segment_data_iter; typedef std::list Segment_list; - typedef typename Segment_list::iterator Segment_iter; typedef typename std::list::const_iterator Point_const_iter; typedef typename Traits::Construct_segment_2 Construct_segment_2; diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h index 38babbe0597..814c5b8ca20 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h @@ -889,7 +889,6 @@ public: typedef typename std::iterator_traits::value_type Input_point; typedef std::vector Input_point_vector ; - typedef typename Input_point_vector::iterator Input_point_iterator ; // Remove coincident consecutive vertices Input_point_vector lList; diff --git a/Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h b/Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h index e407243f46d..876971d5a6e 100644 --- a/Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h +++ b/Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h @@ -553,7 +553,6 @@ optional< Point_2 > construct_normal_offset_lines_isecC2 ( intrusive_ptr< Tri { typedef typename K::FT FT ; - typedef Point_2 Point_2 ; typedef Line_2 Line_2 ; typedef optional Optional_line_2 ; diff --git a/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h b/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h index 1c2dcf4fbb4..ef631e6659e 100644 --- a/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h +++ b/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h @@ -47,7 +47,6 @@ create_partial_interior_straight_skeleton_2 ( FT const& aMaxTime ) { typedef Straight_skeleton_2 Ss ; - typedef boost::shared_ptr SsPtr ; typedef Straight_skeleton_builder_traits_2 SsBuilderTraits; diff --git a/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h b/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h index ded63d4ab9f..a85e80de40a 100644 --- a/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h +++ b/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h @@ -62,7 +62,6 @@ create_interior_straight_skeleton_2 ( PointIterator aOuterContour_VerticesBegin ) { typedef Straight_skeleton_2 Ss ; - typedef boost::shared_ptr SsPtr ; typedef Straight_skeleton_builder_traits_2 SsBuilderTraits; diff --git a/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h b/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h index 3c03d45d62e..8acf94505f3 100644 --- a/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h +++ b/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h @@ -235,9 +235,7 @@ Uncertain compare_offset_lines_isec_timesC2 ( intrusive_ptr< ) { typedef typename K::FT FT ; - - typedef Trisegment_2 Trisegment_2 ; - + typedef Rational Rational ; typedef Quotient Quotient ; typedef optional Optional_rational ; @@ -361,7 +359,6 @@ oriented_side_of_event_point_wrt_bisectorC2 ( intrusive_ptr< Trisegment_2 > c typedef Point_2 Point_2 ; typedef Line_2 Line_2 ; - typedef Trisegment_2 Trisegment_2 ; Uncertain rResult = Uncertain::indeterminate(); @@ -480,9 +477,6 @@ Uncertain are_events_simultaneousC2 ( intrusive_ptr< Trisegment_2 > con typedef typename K::FT FT ; typedef Point_2 Point_2 ; - typedef Line_2 Line_2 ; - - typedef Trisegment_2 Trisegment_2 ; typedef Rational Rational ; typedef Quotient Quotient ; diff --git a/Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h b/Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h index 09681dd14c8..293ba823e6f 100644 --- a/Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h +++ b/Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h @@ -42,11 +42,6 @@ namespace Subdivision_method_3 { void PQQ_1step(Poly& p, Mask mask) { typedef Polyhedron_decorator_3 PD; - typedef typename Poly::Halfedge_data_structure HDS; - typedef typename Poly::Vertex Vertex; - typedef typename Poly::Halfedge Halfedge; - typedef typename Poly::Facet Facet; - typedef typename Poly::Vertex_handle Vertex_handle; typedef typename Poly::Halfedge_handle Halfedge_handle; typedef typename Poly::Facet_handle Facet_handle; @@ -168,8 +163,6 @@ namespace Subdivision_method_3 { typedef Polyhedron_decorator_3 PD; - typedef typename Poly::Halfedge_data_structure HDS; - typedef typename Poly::Vertex Vertex; typedef typename Poly::Halfedge Halfedge; typedef typename Poly::Facet Facet; @@ -278,8 +271,6 @@ namespace Subdivision_method_3 { typedef Polyhedron_decorator_3 PD; - typedef typename Poly::Halfedge_data_structure HDS; - typedef typename Poly::Vertex Vertex; typedef typename Poly::Halfedge Halfedge; typedef typename Poly::Facet Facet; @@ -288,7 +279,6 @@ namespace Subdivision_method_3 { typedef typename Poly::Facet_handle Facet_handle; typedef typename Poly::Vertex_iterator Vertex_iterator; - typedef typename Poly::Halfedge_iterator Halfedge_iterator; typedef typename Poly::Edge_iterator Edge_iterator; typedef typename Poly::Facet_iterator Facet_iterator; @@ -487,27 +477,16 @@ namespace Subdivision_method_3 { template class Mask> void Sqrt3_1step(Poly& p, Mask mask) { - typedef Polyhedron_decorator_3 PD; - - typedef typename Poly::Halfedge_data_structure HDS; typedef typename Poly::Vertex Vertex; typedef typename Poly::Halfedge Halfedge; typedef typename Poly::Facet Facet; - typedef typename Poly::Vertex_handle Vertex_handle; typedef typename Poly::Halfedge_handle Halfedge_handle; - typedef typename Poly::Facet_handle Facet_handle; typedef typename Poly::Vertex_iterator Vertex_iterator; - typedef typename Poly::Halfedge_iterator Halfedge_iterator; typedef typename Poly::Edge_iterator Edge_iterator; typedef typename Poly::Facet_iterator Facet_iterator; - typedef typename Poly::Halfedge_around_facet_circulator - Halfedge_around_facet_circulator; - typedef typename Poly::Halfedge_around_vertex_circulator - Halfedge_around_vertex_circulator; - typedef typename Poly::Traits Traits; typedef typename Traits::Kernel Kernel; typedef typename Kernel::Point_3 Point; diff --git a/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h b/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h index bc171ec9f72..bd3e18822e4 100644 --- a/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h +++ b/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h @@ -95,12 +95,8 @@ namespace Surface_mesher { typedef typename Tr::Cell_handle Cell_handle; typedef typename GT::Point_3 Point_3; typedef typename GT::Triangle_3 Triangle_3; - typedef typename GT::Sphere_3 Sphere_3; - typedef typename GT::Ray_3 Ray_3; - typedef typename GT::Line_3 Line_3; typedef typename GT::Vector_3 Vector_3; typedef typename GT::FT FT; - typedef typename Surface_mesh_traits::Surface_3 Surface_3; typedef typename Surface_mesh_traits::Intersection_point Intersection_point; typename GT::Construct_midpoint_3 midpoint = diff --git a/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/include/compute_normal.h b/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/include/compute_normal.h index 3437332ab75..ad8c190a3d0 100644 --- a/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/include/compute_normal.h +++ b/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/include/compute_normal.h @@ -24,7 +24,6 @@ typename Kernel::Vector_3 compute_facet_normal(const Facet& f) template typename Kernel::Vector_3 compute_vertex_normal(const Vertex& v) { - typedef typename Kernel::Point_3 Point; typedef typename Kernel::Vector_3 Vector; typedef typename Vertex::Halfedge_around_vertex_const_circulator HV_circulator; typedef typename Vertex::Facet Facet; diff --git a/Surface_reconstruction_points_3/include/CGAL/Poisson_mesh_cell_criteria_3.h b/Surface_reconstruction_points_3/include/CGAL/Poisson_mesh_cell_criteria_3.h index 35e5858a3f7..ddc49789022 100644 --- a/Surface_reconstruction_points_3/include/CGAL/Poisson_mesh_cell_criteria_3.h +++ b/Surface_reconstruction_points_3/include/CGAL/Poisson_mesh_cell_criteria_3.h @@ -113,7 +113,6 @@ public: typedef typename Tr::Geom_traits Geom_traits; typedef typename Geom_traits::Compute_squared_radius_3 Radius; typedef typename Geom_traits::Compute_squared_distance_3 Distance; - typedef typename Geom_traits::FT FT; Radius radius = Geom_traits().compute_squared_radius_3_object(); Distance distance = Geom_traits().compute_squared_distance_3_object(); diff --git a/Surface_reconstruction_points_3/include/CGAL/poisson_refine_triangulation.h b/Surface_reconstruction_points_3/include/CGAL/poisson_refine_triangulation.h index 6a976622167..2fd71a065b9 100644 --- a/Surface_reconstruction_points_3/include/CGAL/poisson_refine_triangulation.h +++ b/Surface_reconstruction_points_3/include/CGAL/poisson_refine_triangulation.h @@ -206,11 +206,6 @@ unsigned int poisson_refine_triangulation( // Convergence is guaranteed if radius_edge_ratio_bound >= 1.0 CGAL_surface_reconstruction_points_precondition(radius_edge_ratio_bound >= 1.0); - // Basic geometric types - typedef typename Tr::Geom_traits Gt; - typedef typename Gt::FT FT; - typedef typename Gt::Point_3 Point; - // Mesher_level types typedef Poisson_mesh_cell_criteria_3 Tets_criteria; typedef typename CGAL::Surface_mesh_traits_generator_3::type Oracle; diff --git a/Triangulation_2/include/CGAL/apply_to_range.h b/Triangulation_2/include/CGAL/apply_to_range.h index be64da04047..94abba08c71 100644 --- a/Triangulation_2/include/CGAL/apply_to_range.h +++ b/Triangulation_2/include/CGAL/apply_to_range.h @@ -35,8 +35,6 @@ void apply_to_range(const Tr &t, { if (t.dimension()<2) return; typedef typename Tr::Point POINT; - typedef typename Tr::Segment SEGMENT; - typedef typename Tr::Triangle TRIANGLE; typedef typename Tr::Face_handle hFACE; typedef typename Tr::Vertex_handle hVERTEX; typedef typename Tr::Line_face_circulator LFC; diff --git a/Width_3/include/CGAL/Width_3.h b/Width_3/include/CGAL/Width_3.h index 4d1b295f717..e24cbec0e90 100644 --- a/Width_3/include/CGAL/Width_3.h +++ b/Width_3/include/CGAL/Width_3.h @@ -1385,18 +1385,10 @@ class Width_3 { void width_3_convex(InputPolyhedron &P) { DEBUGMSG(WIDTH_3_CONVEX,"\nBegin WIDTH_3_CONVEX"); typedef CGAL::Width_3_internal::Data_access DA; - typedef typename DA::Polyhedron Polyhedron; - typedef typename DA::Vertex Vertex; - typedef typename DA::Facet Facet; - typedef typename DA::Halfedge Halfedge; typedef typename DA::Facet_handle Facet_handle; typedef typename DA::Vertex_handle Vertex_handle; typedef typename DA::Halfedge_handle Halfedge_handle; - typedef typename DA::PolyPoint PolyPoint; - typedef typename DA::Plane Plane; - typedef typename DA::Halfedge_iterator Halfedge_iterator; typedef typename DA::Vertex_iterator Vertex_iterator; - typedef typename DA::Facet_iterator Facet_iterator; //Ensure that Polyhedron has at least one vertex CGAL_assertion_msg(P.size_of_vertices()>2, "Can not compute width of a 0, 1 or 2-vertex polyhedron");