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

object_cast -> assign : remove warning uninitialized variables (approved by RM)

This commit is contained in:
Sébastien Loriot 2009-07-09 08:38:56 +00:00
parent 7e00f2fa49
commit ee8f225830
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Cartesian_kernel/include/CGAL/Cartesian/Circle_3.h
View File

@ -81,13 +81,13 @@ public:
Object obj = R().intersect_3_object()(s1, s2); Object obj = R().intersect_3_object()(s1, s2);
// s1,s2 must intersect // s1,s2 must intersect
CGAL_kernel_precondition(!(obj.is_empty())); CGAL_kernel_precondition(!(obj.is_empty()));
typename R::Circle_3 circle; const typename R::Circle_3* circle_ptr=object_cast<typename R::Circle_3>(&obj);
typename R::Point_3 point; if(circle_ptr!=NULL)
if(assign(circle, obj)) base = Rep(circle_ptr->diametral_sphere(), circle_ptr->supporting_plane());
base = Rep(circle.diametral_sphere(), circle.supporting_plane());
else { else {
assign(point, obj); const typename R::Point_3* point=object_cast<typename R::Point_3>(&obj);
CircleC3 circle = CircleC3(point, FT(0), Vector_3(FT(1),FT(0),FT(0))); CGAL_kernel_precondition(point!=NULL);
CircleC3 circle = CircleC3(*point, FT(0), Vector_3(FT(1),FT(0),FT(0)));
base = Rep(circle.diametral_sphere(), circle.supporting_plane()); base = Rep(circle.diametral_sphere(), circle.supporting_plane());
} }
} }
@ -98,13 +98,13 @@ public:
Object obj = R().intersect_3_object()(p, s); Object obj = R().intersect_3_object()(p, s);
// s1,s2 must intersect // s1,s2 must intersect
CGAL_kernel_precondition(!(obj.is_empty())); CGAL_kernel_precondition(!(obj.is_empty()));
typename R::Circle_3 circle; const typename R::Circle_3* circle_ptr=object_cast<typename R::Circle_3>(&obj);
typename R::Point_3 point; if(circle_ptr!=NULL)
if(assign(circle, obj)) base = Rep(circle_ptr->diametral_sphere(), circle_ptr->supporting_plane());
base = Rep(circle.diametral_sphere(), circle.supporting_plane());
else { else {
assign(point, obj); const typename R::Point_3* point=object_cast<typename R::Point_3>(&obj);
CircleC3 circle = CircleC3(point, FT(0), Vector_3(FT(1),FT(0),FT(0))); CGAL_kernel_precondition(point!=NULL);
CircleC3 circle = CircleC3(*point, FT(0), Vector_3(FT(1),FT(0),FT(0)));
base = Rep(circle.diametral_sphere(), circle.supporting_plane()); base = Rep(circle.diametral_sphere(), circle.supporting_plane());
} }
} }