diff --git a/Triangulation/examples/Triangulation/barycentric_subdivision.cpp b/Triangulation/examples/Triangulation/barycentric_subdivision.cpp index e48031a9322..c4af3281f65 100644 --- a/Triangulation/examples/Triangulation/barycentric_subdivision.cpp +++ b/Triangulation/examples/Triangulation/barycentric_subdivision.cpp @@ -15,7 +15,6 @@ template< typename TDS > void barycentric_subdivide(TDS & tds, typename TDS::Full_cell_handle fc) { /* This function builds the barycentric subdivision of a single full cell |fc| from a triangulation data structure |tds|. */ - typedef typename TDS::Full_cell_handle Full_cell_handle; typedef typename TDS::Vertex_handle Vertex_handle; typedef typename TDS::Face Face; const int dim = tds.current_dimension(); @@ -56,7 +55,6 @@ void find_face_from_vertices( const TDS & tds, { /* The main goal of this function is to find a full cell that contains a given set of vertices |face_vertices|. Then, it builds a corresponding |face|. */ - typedef typename TDS::Face Face; typedef typename TDS::Vertex_handle Vertex_handle; typedef typename TDS::Full_cell_handle Full_cell_handle; typedef typename TDS::Full_cell::Vertex_handle_iterator Vertex_h_iterator; diff --git a/Triangulation/include/CGAL/Delaunay_triangulation.h b/Triangulation/include/CGAL/Delaunay_triangulation.h index a1c7b0c3290..0210107fb53 100644 --- a/Triangulation/include/CGAL/Delaunay_triangulation.h +++ b/Triangulation/include/CGAL/Delaunay_triangulation.h @@ -777,7 +777,6 @@ Delaunay_triangulation ::insert_in_conflicting_cell(const Point & p, const Full_cell_handle s) { typedef std::vector Full_cell_h_vector; - typedef typename Full_cell_h_vector::iterator SHV_iterator; static Full_cell_h_vector cs; // for storing conflicting full_cells. cs.clear(); // cs.reserve(64); diff --git a/Triangulation/include/CGAL/Triangulation.h b/Triangulation/include/CGAL/Triangulation.h index fdb1b47dd20..2a56dfa751a 100644 --- a/Triangulation/include/CGAL/Triangulation.h +++ b/Triangulation/include/CGAL/Triangulation.h @@ -1226,11 +1226,8 @@ operator>>(std::istream & is, Triangulation & tr) // of vertices, plus the non combinatorial information on each full_cell // - the neighbors of each full_cell by their index in the preceding list { - typedef Triangulation T; + typedef Triangulation T; typedef typename T::Vertex_handle Vertex_handle; - typedef typename T::Vertex_iterator Vertex_iterator; - typedef typename T::Full_cell_handle Full_cell_handle; - typedef typename T::Full_cell_iterator Full_cell_iterator; // read current dimension and number of vertices size_t n; @@ -1284,8 +1281,6 @@ operator<<(std::ostream & os, const Triangulation & tr) typedef Triangulation T; typedef typename T::Vertex_const_handle Vertex_handle; typedef typename T::Vertex_const_iterator Vertex_iterator; - typedef typename T::Full_cell_const_handle Full_cell_handle; - typedef typename T::Full_cell_const_iterator Full_cell_iterator; // outputs dimensions and number of vertices size_t n = tr.number_of_vertices(); diff --git a/Triangulation/test/Triangulation/test_delaunay.cpp b/Triangulation/test/Triangulation/test_delaunay.cpp index b5509694209..9e7076f2194 100644 --- a/Triangulation/test/Triangulation/test_delaunay.cpp +++ b/Triangulation/test/Triangulation/test_delaunay.cpp @@ -16,14 +16,9 @@ void test(const int d, const string & type, const int N) // we must write 'typename' below, because we are in a template-function, // so the parser has no way to know that DC contains sub-types, before // instanciating the function. - typedef typename DC::Vertex Vertex; - typedef typename DC::Vertex_handle Vertex_handle; - typedef typename DC::Full_cell Full_cell; typedef typename DC::Full_cell_handle Full_cell_handle; - typedef typename DC::Facet Facet; typedef typename DC::Face Face; typedef typename DC::Point Point; - typedef typename DC::Geom_traits::RT RT; typedef typename DC::Finite_full_cell_const_iterator Finite_full_cell_const_iterator; typedef typename DC::Finite_vertex_iterator Finite_vertex_iterator; diff --git a/Triangulation/test/Triangulation/test_torture.cpp b/Triangulation/test/Triangulation/test_torture.cpp index 8a0355c94ea..245127811c2 100644 --- a/Triangulation/test/Triangulation/test_torture.cpp +++ b/Triangulation/test/Triangulation/test_torture.cpp @@ -19,14 +19,8 @@ void test(const int D, const int d, const int N, bool no_transform) // we must write 'typename' below, because we are in a template-function, // so the parser has no way to know that DC contains sub-types, before // instanciating the function. - typedef typename DC::Vertex Vertex; - typedef typename DC::Vertex_handle Vertex_handle; - typedef typename DC::Full_cell Full_cell; - typedef typename DC::Full_cell_handle Full_cell_handle; - typedef typename DC::Facet Facet; typedef typename DC::Point Point; typedef typename DC::Geom_traits::RT RT; - typedef typename DC::Finite_full_cell_const_iterator Finite_full_cell_const_iterator; DC dc(D); diff --git a/Triangulation/test/Triangulation/test_triangulation.cpp b/Triangulation/test/Triangulation/test_triangulation.cpp index 425bd54e377..d43c33c76bb 100644 --- a/Triangulation/test/Triangulation/test_triangulation.cpp +++ b/Triangulation/test/Triangulation/test_triangulation.cpp @@ -14,11 +14,7 @@ void test(const int d, const string & type, int N) // we must write 'typename' below, because we are in a template-function, // so the parser has no way to know that T contains sub-types, before // instanciating the function. - typedef typename T::Vertex Vertex; - typedef typename T::Vertex_handle Vertex_handle; - typedef typename T::Full_cell Full_cell; typedef typename T::Full_cell_handle Full_cell_handle; - typedef typename T::Facet Facet; typedef typename T::Point Point; typedef typename T::Geom_traits::RT RT; typedef typename T::Finite_full_cell_const_iterator Finite_full_cell_const_iterator;