From f56c8dfbd2f7b879db3057f09aab3f79fbbce920 Mon Sep 17 00:00:00 2001 From: Mariette Yvinec Date: Wed, 30 Jan 2002 12:14:09 +0000 Subject: [PATCH] added missing typenames in Constrained_triangulation_plus_2.h Constraint_hierarchy_2.h --- .../include/CGAL/Constrained_triangulation_plus_2.h | 10 +++++----- .../include/CGAL/Constraint_hierarchy_2.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h b/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h index 89bbbfb18a5..d8174aa5177 100644 --- a/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h +++ b/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h @@ -66,11 +66,11 @@ public: typedef Constraint_hierarchy_2 Constraint_hierarchy; // for user interface with the constraint hierarchy - typedef Constraint_hierarchy::H_vertex_it Vertices_in_constraint; - typedef Constraint_hierarchy::H_context Context; - typedef Constraint_hierarchy::H_context_iterator Context_iterator; - typedef Constraint_hierarchy::H_c_iterator Constraint_iterator; - typedef Constraint_hierarchy::H_sc_iterator Subconstraint_iterator; + typedef typename Constraint_hierarchy::H_vertex_it Vertices_in_constraint; + typedef typename Constraint_hierarchy::H_context Context; + typedef typename Constraint_hierarchy::H_context_iterator Context_iterator; + typedef typename Constraint_hierarchy::H_c_iterator Constraint_iterator; + typedef typename Constraint_hierarchy::H_sc_iterator Subconstraint_iterator; protected: diff --git a/Packages/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h b/Packages/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h index b9e1abb108e..2708494ca28 100644 --- a/Packages/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h +++ b/Packages/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h @@ -47,9 +47,9 @@ public: typedef Constraint_hierarchy_2 Hierarchy; typedef std::pair H_constraint; typedef std::list H_vertex_list; - typedef std::list::iterator H_vertex_it; typedef std::list H_constraint_list; - typedef std::list::iterator H_constraint_it; + typedef typename std::list::iterator H_vertex_it; + typedef typename std::list::iterator H_constraint_it; class H_context { friend class Hierarchy; @@ -63,7 +63,7 @@ public: int number_of_vertices() {return enclosing->size();} }; typedef std::list H_context_list; - typedef std::list::iterator H_context_iterator; + typedef typename std::list::iterator H_context_iterator; typedef std::map H_vertex_map; typedef std::map H_c_to_sc_map;