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 d8174aa5177..0a5701091e0 100644 --- a/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h +++ b/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h @@ -193,7 +193,7 @@ public: template inline -Constrained_triangulation_plus_2::Vertex_handle +typename Constrained_triangulation_plus_2::Vertex_handle Constrained_triangulation_plus_2:: push_back(const Point &p) { @@ -213,7 +213,7 @@ push_back(const Constraint &c) template < class Tr, class I_tag > inline Constrained_triangulation_plus_2::Vertex_handle -Constrained_triangulation_plus_2:: +typename Constrained_triangulation_plus_2:: insert(const Point& a, Face_handle start) { Locate_type lt; @@ -224,7 +224,7 @@ insert(const Point& a, Face_handle start) template < class Tr, class I_tag > Constrained_triangulation_plus_2::Vertex_handle -Constrained_triangulation_plus_2:: +typename Constrained_triangulation_plus_2:: insert(const Point& a, Locate_type lt, Face_handle loc, int li) { Vertex_handle v1, v2; @@ -414,7 +414,7 @@ find_intersected_faces(Vertex_handle vaa, } template -Constrained_triangulation_plus_2:: Vertex_handle +Constrained_triangulation_plus_2::Vertex_handle Constrained_triangulation_plus_2:: intersect(Face_handle f, int i, Vertex_handle vaa, @@ -424,7 +424,7 @@ intersect(Face_handle f, int i, } template -Constrained_triangulation_plus_2:: Vertex_handle +typename Constrained_triangulation_plus_2::Vertex_handle Constrained_triangulation_plus_2:: intersect(Face_handle f, int i, Vertex_handle vaa, @@ -472,7 +472,7 @@ intersect(Face_handle f, int i, template -Constrained_triangulation_plus_2:: Vertex_handle +typename Constrained_triangulation_plus_2::Vertex_handle Constrained_triangulation_plus_2:: intersect(Face_handle f, int i, Vertex_handle vaa, @@ -556,7 +556,7 @@ subconstraints_end() const template inline -Constrained_triangulation_plus_2::Context +typename Constrained_triangulation_plus_2::Context Constrained_triangulation_plus_2:: context(Vertex_handle va, Vertex_handle vb) { @@ -574,7 +574,7 @@ number_of_enclosing_constraints(Vertex_handle va, Vertex_handle vb) template inline -Constrained_triangulation_plus_2::Context_iterator +typename Constrained_triangulation_plus_2::Context_iterator Constrained_triangulation_plus_2:: contexts_begin(Vertex_handle va, Vertex_handle vb) { @@ -583,7 +583,7 @@ contexts_begin(Vertex_handle va, Vertex_handle vb) template inline -Constrained_triangulation_plus_2::Context_iterator +typename Constrained_triangulation_plus_2::Context_iterator Constrained_triangulation_plus_2:: contexts_end(Vertex_handle va, Vertex_handle vb) { @@ -592,7 +592,7 @@ contexts_end(Vertex_handle va, Vertex_handle vb) template inline -Constrained_triangulation_plus_2::Vertices_in_constraint +typename Constrained_triangulation_plus_2::Vertices_in_constraint Constrained_triangulation_plus_2:: vertices_in_constraint_begin(Vertex_handle va, Vertex_handle vb) { @@ -601,7 +601,7 @@ vertices_in_constraint_begin(Vertex_handle va, Vertex_handle vb) template inline -Constrained_triangulation_plus_2::Vertices_in_constraint +typename Constrained_triangulation_plus_2::Vertices_in_constraint Constrained_triangulation_plus_2:: vertices_in_constraint_end(Vertex_handle va, Vertex_handle vb) { diff --git a/Packages/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h b/Packages/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h index 2708494ca28..3677830df79 100644 --- a/Packages/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h +++ b/Packages/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h @@ -27,9 +27,9 @@ #define CGAL_CONSTRAINT_HIERARCHY_2_H #include -#include -#include -#include +#include +#include +#include #include #include @@ -37,7 +37,6 @@ CGAL_BEGIN_NAMESPACE // T is expected to be Vertex_handle // Data is intended to store info on a Vertex - template class Constraint_hierarchy_2 { @@ -52,7 +51,7 @@ public: typedef typename std::list::iterator H_constraint_it; class H_context { - friend class Hierarchy; + friend class Constraint_hierarchy_2; private: H_vertex_list* enclosing; H_vertex_it pos; @@ -233,7 +232,7 @@ enclosing_constraints(T vaa, T vbb , H_constraint_list& hcl) const } template -Constraint_hierarchy_2::H_context +typename Constraint_hierarchy_2::H_context Constraint_hierarchy_2:: context(T va, T vb) { @@ -253,7 +252,7 @@ number_of_enclosing_constraints(T va, T vb) } template -Constraint_hierarchy_2::H_context_iterator +typename Constraint_hierarchy_2::H_context_iterator Constraint_hierarchy_2:: contexts_begin(T va, T vb) { @@ -263,7 +262,7 @@ contexts_begin(T va, T vb) } template -Constraint_hierarchy_2::H_context_iterator +typename Constraint_hierarchy_2::H_context_iterator Constraint_hierarchy_2:: contexts_end(T va, T vb) { @@ -283,7 +282,7 @@ vertices_in_constraint_begin(T va, T vb) } template -Constraint_hierarchy_2::H_vertex_it +typename Constraint_hierarchy_2::H_vertex_it Constraint_hierarchy_2:: vertices_in_constraint_end(T va, T vb) { @@ -493,7 +492,7 @@ add_Steiner(T va, T vb, T vc){ template inline -Constraint_hierarchy_2::H_edge +typename Constraint_hierarchy_2::H_edge Constraint_hierarchy_2:: make_edge(T va, T vb) const { @@ -536,7 +535,7 @@ get_contexts(T va, T vb, template inline -Constraint_hierarchy_2::H_vertex_it +typename Constraint_hierarchy_2::H_vertex_it Constraint_hierarchy_2:: get_pos(T va, T vb) const //return pos in the first context diff --git a/Packages/Triangulation_2/test/Triangulation_2_constrained/Makefile b/Packages/Triangulation_2/test/Triangulation_2_constrained/Makefile index a6aedb95789..f42e4f4c3a6 100644 --- a/Packages/Triangulation_2/test/Triangulation_2_constrained/Makefile +++ b/Packages/Triangulation_2/test/Triangulation_2_constrained/Makefile @@ -5,7 +5,7 @@ # Choose the right include file from the /make directory. -CGAL_MAKEFILE =/0/prisme_util/CGAL/CGAL-I/make/makefile_i686_Linux-2.2.18_g++-2.95_LEDA +#CGAL_MAKEFILE =/0/prisme_util/CGAL/CGAL-I/make/makefile_i686_Linux-2.2.18_g++-2.95_LEDA include $(CGAL_MAKEFILE)