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

- VC++ workaround. 

- Fix warnings introduced by last change.
This commit is contained in:
Sylvain Pion 2003-07-02 14:00:01 +00:00
parent 88e4cedb62
commit e65d6e2fa6
2 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Packages/Triangulation_3/changes.txt
View File

@ -1,3 +1,7 @@
Version 1.160 (2 July 03)
- VC++ workaround.
- Fix warnings introduced by last change.
Version 1.159 (1 July 03)
- Change the preconditions in insert_in_facet() and insert_in_edge() to be
exactness preconditions.

73
Packages/Triangulation_3/include/CGAL/Triangulation_3.h
View File

@ -61,7 +61,6 @@ class Triangulation_3
friend std::istream& operator>> CGAL_NULL_TMPL_ARGS
(std::istream& is, Triangulation_3<GT,Tds> &tr);
class Infinite_tester;
typedef Triangulation_3<GT, Tds> Self;
public:
typedef Tds Triangulation_data_structure;
@ -93,6 +92,42 @@ public:
typedef Edge_iterator All_edges_iterator;
typedef Vertex_iterator All_vertices_iterator;
private:
// This class is used to generate the Finite_*_iterators.
class Infinite_tester
{
const Self *t;
public:
Infinite_tester() {}
Infinite_tester(const Self *tr)
: t(tr) {}
bool operator()(const Vertex_iterator & v) const
{
return t->is_infinite(v);
}
bool operator()(const Cell_iterator & c) const
{
return t->is_infinite(c);
}
bool operator()(const Edge_iterator & e) const
{
return t->is_infinite(*e);
}
bool operator()(const Facet_iterator & f) const
{
return t->is_infinite(*f);
}
};
public:
// We derive in order to add a conversion to handle.
class Finite_cells_iterator
: public Filter_iterator<Cell_iterator, Infinite_tester> {
@ -741,38 +776,6 @@ private:
}
};
// This class is used to generate the Finite_*_iterators.
class Infinite_tester
{
const Self *t;
public:
Infinite_tester() {}
Infinite_tester(const Self *tr)
: t(tr) {}
bool operator()(const Vertex_iterator & v) const
{
return t->is_infinite(v);
}
bool operator()(const Cell_iterator & c) const
{
return t->is_infinite(c);
}
bool operator()(const Edge_iterator & e) const
{
return t->is_infinite(*e);
}
bool operator()(const Facet_iterator & f) const
{
return t->is_infinite(*f);
}
};
// They access "Self", so need to be friend.
friend class Conflict_tester_outside_convex_hull_3;
@ -2409,7 +2412,7 @@ insert_in_facet(const Point & p, Cell_handle c, int i)
CGAL_triangulation_precondition( dimension() == 2 || dimension() == 3);
CGAL_triangulation_precondition( (dimension() == 2 && i == 3)
|| (dimension() == 3 && i >= 0 && i <= 3) );
CGAL_triangulation_precondition_code
CGAL_triangulation_exactness_precondition_code
( Locate_type lt;
int li; int lj; );
CGAL_triangulation_exactness_precondition
@ -2437,7 +2440,7 @@ insert_in_edge(const Point & p, Cell_handle c, int i, int j)
CGAL_triangulation_precondition( dimension() >= 1 && dimension() <= 3 );
CGAL_triangulation_precondition( i >= 0 && i <= dimension()
&& j >= 0 && j <= dimension() );
CGAL_triangulation_precondition_code( Locate_type lt; int li; );
CGAL_triangulation_exactness_precondition_code( Locate_type lt; int li; );
switch ( dimension() ) {
case 3:
case 2: