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

removed warnings

This commit is contained in:
Peter Hachenberger 2007-04-17 07:29:00 +00:00
parent 6c1e314ab3
commit 3b6c45efa6
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Nef_S2/include/CGAL/Nef_S2/SM_triangulator.h
View File

@ -599,7 +599,7 @@ complete_support(SVertex_iterator v_start, SVertex_iterator v_end,
for (SVertex_iterator v = v_start; v != v_end; ++v) {
CGAL_NEF_TRACEN(" vertex = "<<PH(v));
SHalfedge_handle e_below = halfedge_below(v);
if ( v != v_start )
if ( v != v_start ) {
if ( e_below != SHalfedge_handle() ) {
m_buffer = incident_mark(e_below);
} else { // e_below does not exist
@ -608,7 +608,8 @@ complete_support(SVertex_iterator v_start, SVertex_iterator v_end,
// CGAL_assertion( point(v).z() == 0 &&
// ( pos > 0 ? (point(v).x() >= 0) : (point(v).x()<=0)) );
m_buffer = incident_mark(first_out_edge(v)->sprev());
}
}
}
CGAL_NEF_TRACEN(" face mark below "<<m_buffer);
Object_handle o = support(v);

10
Nef_S2/include/CGAL/Nef_S2/Sphere_geometry_OGL.h
View File

@ -234,7 +234,7 @@ public:
Sphere_point(const CGAL::Sphere_point<R>& p,
CGAL::Color c = CGAL::BLACK, unsigned w = 10) :
VPoint(Approximator<R>::approximate(p)), p_(p), c_(c), w_(w) {}
Sphere_point(const Sphere_point<R>& p) : VPoint(p)
Sphere_point(const Sphere_point<R>& p) : VPoint(p), Gen_object()
{ p_ = p.p_; c_ = p.c_; w_ = p.w_; }
Sphere_point<R>& operator=(const Sphere_point<R>& p)
{ VPoint::operator=(p); p_ = p.p_; c_ = p.c_; w_ = p.w_;
@ -277,7 +277,7 @@ public:
Sphere_segment(const CGAL::Sphere_segment<R>& s,
CGAL::Color c = CGAL::BLACK, unsigned w = 2)
: VSegment(Approximator<R>::approximate(s)), s_(s), c_(c), w_(w) {}
Sphere_segment(const Sphere_segment<R>& s) : VSegment(s)
Sphere_segment(const Sphere_segment<R>& s) : VSegment(s), Gen_object()
{ s_ = s.s_; c_ = s.c_; w_ = s.w_; }
Sphere_segment<R>& operator=(const Sphere_segment<R>& s)
{ VSegment::operator=(s); s_ = s.s_; c_ = s.c_; w_ = s.w_;
@ -330,7 +330,7 @@ public:
Sphere_circle(const CGAL::Sphere_circle<R>& s,
CGAL::Color c = CGAL::BLACK, unsigned w = 2)
: VSegment(Approximator<R>::approximate(s)), s_(s), c_(c), w_(w) {}
Sphere_circle(const Sphere_circle<R>& s) : VSegment(s)
Sphere_circle(const Sphere_circle<R>& s) : VSegment(s), Gen_object()
{ s_ = s.s_; c_ = s.c_; w_ = s.w_; }
Sphere_circle<R>& operator=(const Sphere_circle<R>& s)
{ VSegment::operator=(s); s_ = s.s_; c_ = s.c_; w_ = s.w_;
@ -377,7 +377,7 @@ public:
CGAL::Color c = CGAL::Color(100,100,120))
: VTriangle(Approximator<R>::approximate(t)), t_(t), c_(c) {}
Sphere_triangle(const Sphere_triangle<R>& t) : VTriangle(t)
Sphere_triangle(const Sphere_triangle<R>& t) : VTriangle(t), Gen_object()
{ t_ = t.t_; c_ = t.c_; }
Sphere_triangle<R>& operator=(const Sphere_triangle<R>& t)
@ -489,7 +489,7 @@ void print() const
std::cerr << std::endl;
}
Unit_sphere(const Unit_sphere& S) : switches(2)
Unit_sphere(const Unit_sphere& S) : OGL_base_object(), switches(2)
{ CGAL_NEF_TRACEN("copyconstruction");
sphere_ = gluNewQuadric();
initialized_ = S.initialized_;