mirror of https://github.com/CGAL/cgal
replace some old fashion cast by static_cast in Triangulation_ds_face_2.h
Triangulation_ds_vertex_2.h Try to make is_edge compile on vcc
This commit is contained in:
parent
a18bfdc4b9
commit
40878eb197
|
|
@ -328,8 +328,9 @@ is_edge(const Vertex* va, const Vertex* vb, Face* &fr, int & i) const
|
|||
// if true is returned (fr,i) is the edge ab
|
||||
// with face fr on the right of a->b
|
||||
{
|
||||
Face* fc=va->face(), *start(fc);
|
||||
if (fc == NULL) return false;
|
||||
Face* fc=va->face();
|
||||
Face* start(fc);
|
||||
if (fc == 0) return false;
|
||||
int inda, indb;
|
||||
do {
|
||||
inda=fc->index(va);
|
||||
|
|
|
|||
|
|
@ -321,7 +321,8 @@ is_edge(const Vertex* va, const Vertex* vb, Face* &fr, int & i) const
|
|||
// (fr,i) is the edge ab
|
||||
// with face fr on the right of a->b
|
||||
{
|
||||
Face* fc=va->face(), *start(fc);
|
||||
Face* fc=va->face();
|
||||
Face* start(fc);
|
||||
if (fc == NULL) return false;
|
||||
int inda, indb;
|
||||
do {
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ Triangulation_ds_vertex_2<Vb,Fb> *
|
|||
Triangulation_ds_face_2<Vb,Fb>::
|
||||
vertex(int i) const
|
||||
{
|
||||
return( (Vertex*) (Fb::vertex(i)));
|
||||
return( static_cast<Vertex*>(Fb::vertex(i)) );
|
||||
}
|
||||
|
||||
template < class Vb, class Fb >
|
||||
|
|
@ -162,7 +162,7 @@ Triangulation_ds_face_2<Vb,Fb>*
|
|||
Triangulation_ds_face_2<Vb,Fb>::
|
||||
neighbor(int i) const
|
||||
{
|
||||
return ((Face*) Fb::neighbor(i));
|
||||
return (static_cast<Face*>(Fb::neighbor(i)) );
|
||||
}
|
||||
|
||||
template < class Vb, class Fb >
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ public:
|
|||
void set_face(Face* f) { Vb::set_face(f); }
|
||||
|
||||
//ACCESS
|
||||
Face* face() const {return ( (Face *) (Vb::face()) );}
|
||||
Face* face() const {return ( static_cast<Face *>(Vb::face()) );}
|
||||
int degree() const ;
|
||||
|
||||
inline Vertex_circulator incident_vertices() const {
|
||||
|
|
|
|||
Loading…
Reference in New Issue