diff --git a/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_2.h b/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_2.h index 05dda87f8d3..3dee26c79aa 100644 --- a/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_2.h +++ b/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_2.h @@ -3,11 +3,14 @@ #include #include +#include +#include #include #include #include -#include +#include +#include template < class Gt, class Tds> @@ -20,18 +23,21 @@ public: typedef CGAL_Constrained_triangulation_2 Constrained_triangulation; typedef pair Constraint; - typedef CGAL_Constrained_triangulation_sweep Sweep; + typedef CGAL_Constrained_triangulation_sweep_2 Sweep; CGAL_Constrained_triangulation_2() : Triangulation() { } CGAL_Constrained_triangulation_2(const Gt& gt) : Triangulation(gt) { } - CGAL_Constrained_triangulation_2(list& lc, Gt& gt=Gt()) + CGAL_Constrained_triangulation_2(const Vertex_handle& v, const Gt& gt) + : Triangulation(v,gt) {} + + CGAL_Constrained_triangulation_2(list& lc, const Gt& gt=Gt()) : CGAL_Triangulation_2(gt) { Sweep sweep(lc,gt); - init(sweep.vertex()); - CGAL_triangulation_postcondition( is_valid() ); + CGAL_Triangulation_2 Tr ( sweep.vertex(), gt); + swap(Tr); } #ifdef CGAL_CFG_NO_MEMBER_TEMPLATES @@ -125,7 +131,7 @@ template < class Gt, class Tds > ostream & operator<<(ostream& os, const CGAL_Constrained_triangulation_2 &Ct) { - return os << (const CGAL_Triangulation_2&)Ct; + return os << (const CGAL_Triangulation_2&)Ct; }