minor modification that compiles and run on papillon

This commit is contained in:
Mariette Yvinec 1998-07-02 15:15:29 +00:00
parent 60d0d5c8ce
commit 0e37ebd127
1 changed files with 12 additions and 6 deletions

View File

@ -3,11 +3,14 @@
#include <pair.h> #include <pair.h>
#include <list.h> #include <list.h>
#include <vector.h>
#include <map.h>
#include <CGAL/triangulation_assertions.h> #include <CGAL/triangulation_assertions.h>
#include <CGAL/Triangulation_short_names_2.h> #include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Triangulation_2.h> #include <CGAL/Triangulation_2.h>
#include <CGAL/Constrained_triangulation_sweep.h> #include <CGAL/Constrained_triangulation_face_base_2.h>
#include <CGAL/Constrained_triangulation_sweep_2.h>
template < class Gt, class Tds> template < class Gt, class Tds>
@ -20,18 +23,21 @@ public:
typedef CGAL_Constrained_triangulation_2<Gt,Tds> Constrained_triangulation; typedef CGAL_Constrained_triangulation_2<Gt,Tds> Constrained_triangulation;
typedef pair<Point,Point> Constraint; typedef pair<Point,Point> Constraint;
typedef CGAL_Constrained_triangulation_sweep<Gt,Tds> Sweep; typedef CGAL_Constrained_triangulation_sweep_2<Gt,Tds> Sweep;
CGAL_Constrained_triangulation_2() : Triangulation() { } CGAL_Constrained_triangulation_2() : Triangulation() { }
CGAL_Constrained_triangulation_2(const Gt& gt) : Triangulation(gt) { } CGAL_Constrained_triangulation_2(const Gt& gt) : Triangulation(gt) { }
CGAL_Constrained_triangulation_2(list<Constraint>& lc, Gt& gt=Gt()) CGAL_Constrained_triangulation_2(const Vertex_handle& v, const Gt& gt)
: Triangulation(v,gt) {}
CGAL_Constrained_triangulation_2(list<Constraint>& lc, const Gt& gt=Gt())
: CGAL_Triangulation_2<Gt,Tds>(gt) : CGAL_Triangulation_2<Gt,Tds>(gt)
{ {
Sweep sweep(lc,gt); Sweep sweep(lc,gt);
init(sweep.vertex()); CGAL_Triangulation_2<Gt,Tds> Tr ( sweep.vertex(), gt);
CGAL_triangulation_postcondition( is_valid() ); swap(Tr);
} }
#ifdef CGAL_CFG_NO_MEMBER_TEMPLATES #ifdef CGAL_CFG_NO_MEMBER_TEMPLATES
@ -125,7 +131,7 @@ template < class Gt, class Tds >
ostream & ostream &
operator<<(ostream& os, const CGAL_Constrained_triangulation_2<Gt,Tds> &Ct) operator<<(ostream& os, const CGAL_Constrained_triangulation_2<Gt,Tds> &Ct)
{ {
return os << (const CGAL_Triangulation_2<T>&)Ct; return os << (const CGAL_Triangulation_2<Gt,Tds>&)Ct;
} }