songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added "typename"s in Constrained_triangulation_plus_2.h 

and Constraint_hierarchy_2.h
This commit is contained in:
Mariette Yvinec 2002-01-31 11:07:21 +00:00
parent 5a7c6ddadf
commit 4ad5a1096c
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Packages/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
View File

@ -193,7 +193,7 @@ public:
template <class Tr, class I_tag >
inline
Constrained_triangulation_plus_2<Tr,I_tag>::Vertex_handle
typename Constrained_triangulation_plus_2<Tr,I_tag>::Vertex_handle
Constrained_triangulation_plus_2<Tr,I_tag>::
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<Tr,I_tag>::Vertex_handle
Constrained_triangulation_plus_2<Tr,I_tag>::
typename Constrained_triangulation_plus_2<Tr,I_tag>::
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<Tr,I_tag>::Vertex_handle
Constrained_triangulation_plus_2<Tr,I_tag>::
typename Constrained_triangulation_plus_2<Tr,I_tag>::
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 <class Tr, class I_tag >
Constrained_triangulation_plus_2<Tr,I_tag>:: Vertex_handle
Constrained_triangulation_plus_2<Tr,I_tag>::Vertex_handle
Constrained_triangulation_plus_2<Tr,I_tag>::
intersect(Face_handle f, int i,
Vertex_handle vaa,
@ -424,7 +424,7 @@ intersect(Face_handle f, int i,
}
template <class Tr, class I_tag >
Constrained_triangulation_plus_2<Tr,I_tag>:: Vertex_handle
typename Constrained_triangulation_plus_2<Tr,I_tag>::Vertex_handle
Constrained_triangulation_plus_2<Tr,I_tag>::
intersect(Face_handle f, int i,
Vertex_handle vaa,
@ -472,7 +472,7 @@ intersect(Face_handle f, int i,
template <class Tr, class I_tag >
Constrained_triangulation_plus_2<Tr,I_tag>:: Vertex_handle
typename Constrained_triangulation_plus_2<Tr,I_tag>::Vertex_handle
Constrained_triangulation_plus_2<Tr,I_tag>::
intersect(Face_handle f, int i,
Vertex_handle vaa,
@ -556,7 +556,7 @@ subconstraints_end() const
template <class Tr, class I_tag >
inline
Constrained_triangulation_plus_2<Tr,I_tag>::Context
typename Constrained_triangulation_plus_2<Tr,I_tag>::Context
Constrained_triangulation_plus_2<Tr,I_tag>::
context(Vertex_handle va, Vertex_handle vb)
{
@ -574,7 +574,7 @@ number_of_enclosing_constraints(Vertex_handle va, Vertex_handle vb)
template <class Tr, class I_tag >
inline
Constrained_triangulation_plus_2<Tr,I_tag>::Context_iterator
typename Constrained_triangulation_plus_2<Tr,I_tag>::Context_iterator
Constrained_triangulation_plus_2<Tr,I_tag>::
contexts_begin(Vertex_handle va, Vertex_handle vb)
{
@ -583,7 +583,7 @@ contexts_begin(Vertex_handle va, Vertex_handle vb)
template <class Tr, class I_tag >
inline
Constrained_triangulation_plus_2<Tr,I_tag>::Context_iterator
typename Constrained_triangulation_plus_2<Tr,I_tag>::Context_iterator
Constrained_triangulation_plus_2<Tr,I_tag>::
contexts_end(Vertex_handle va, Vertex_handle vb)
{
@ -592,7 +592,7 @@ contexts_end(Vertex_handle va, Vertex_handle vb)
template <class Tr, class I_tag >
inline
Constrained_triangulation_plus_2<Tr,I_tag>::Vertices_in_constraint
typename Constrained_triangulation_plus_2<Tr,I_tag>::Vertices_in_constraint
Constrained_triangulation_plus_2<Tr,I_tag>::
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 <class Tr, class I_tag >
inline
Constrained_triangulation_plus_2<Tr,I_tag>::Vertices_in_constraint
typename Constrained_triangulation_plus_2<Tr,I_tag>::Vertices_in_constraint
Constrained_triangulation_plus_2<Tr,I_tag>::
vertices_in_constraint_end(Vertex_handle va, Vertex_handle vb)
{

21
Packages/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h
View File

@ -27,9 +27,9 @@
#define CGAL_CONSTRAINT_HIERARCHY_2_H
#include <CGAL/basic.h>
#include <pair.h>
#include <map.h>
#include <list.h>
#include <pair>
#include <map>
#include <list>
#include <CGAL/Iterator_project.h>
#include <CGAL/triangulation_assertions.h>
@ -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 T, class Data>
class Constraint_hierarchy_2
{
@ -52,7 +51,7 @@ public:
typedef typename std::list<H_constraint>::iterator H_constraint_it;
class H_context {
friend class Hierarchy;
friend class Constraint_hierarchy_2<T,Data>;
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 <class T, class Data>
Constraint_hierarchy_2<T,Data>::H_context
typename Constraint_hierarchy_2<T,Data>::H_context
Constraint_hierarchy_2<T,Data>::
context(T va, T vb)
{
@ -253,7 +252,7 @@ number_of_enclosing_constraints(T va, T vb)
}
template <class T, class Data>
Constraint_hierarchy_2<T,Data>::H_context_iterator
typename Constraint_hierarchy_2<T,Data>::H_context_iterator
Constraint_hierarchy_2<T,Data>::
contexts_begin(T va, T vb)
{
@ -263,7 +262,7 @@ contexts_begin(T va, T vb)
}
template <class T, class Data>
Constraint_hierarchy_2<T,Data>::H_context_iterator
typename Constraint_hierarchy_2<T,Data>::H_context_iterator
Constraint_hierarchy_2<T,Data>::
contexts_end(T va, T vb)
{
@ -283,7 +282,7 @@ vertices_in_constraint_begin(T va, T vb)
}
template <class T, class Data>
Constraint_hierarchy_2<T,Data>::H_vertex_it
typename Constraint_hierarchy_2<T,Data>::H_vertex_it
Constraint_hierarchy_2<T,Data>::
vertices_in_constraint_end(T va, T vb)
{
@ -493,7 +492,7 @@ add_Steiner(T va, T vb, T vc){
template <class T, class Data>
inline
Constraint_hierarchy_2<T,Data>::H_edge
typename Constraint_hierarchy_2<T,Data>::H_edge
Constraint_hierarchy_2<T,Data>::
make_edge(T va, T vb) const
{
@ -536,7 +535,7 @@ get_contexts(T va, T vb,
template <class T, class Data>
inline
Constraint_hierarchy_2<T,Data>::H_vertex_it
typename Constraint_hierarchy_2<T,Data>::H_vertex_it
Constraint_hierarchy_2<T,Data>::
get_pos(T va, T vb) const
//return pos in the first context

2
Packages/Triangulation_2/test/Triangulation_2_constrained/Makefile
View File

@ -5,7 +5,7 @@
# Choose the right include file from the <cgalroot>/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)