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

aabb tree: attempt to fix warning: 

message is Triangle_3_segment_3_intersection.h:93: warning: control reaches end of non-void function
laurent (R) - can you take a look at it?
This commit is contained in:
Pierre Alliez 2009-07-06 19:40:54 +00:00
parent 192ccd9cc3
commit 7b0f96ca06
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
AABB_tree/include/CGAL/AABB_intersections/Triangle_3_segment_3_intersection.h
View File

@ -41,7 +41,7 @@ intersection_triangle_segment_aux(const typename K::Segment_3 &s1,
typename K::Construct_object_3 make_object = k.construct_object_3_object(); typename K::Construct_object_3 make_object = k.construct_object_3_object();
typename K::Construct_segment_3 make_segment = k.construct_segment_3_object(); typename K::Construct_segment_3 make_segment = k.construct_segment_3_object();
typename K::Compute_squared_distance_3 distance = k.compute_squared_distance_3_object(); typename K::Compute_squared_distance_3 sq_distance = k.compute_squared_distance_3_object();
const Point_3& p1 = s1.source(); const Point_3& p1 = s1.source();
const Point_3& p2 = s1.target(); const Point_3& p2 = s1.target();
@ -49,13 +49,13 @@ intersection_triangle_segment_aux(const typename K::Segment_3 &s1,
const Point_3& q2 = s2.target(); const Point_3& q2 = s2.target();
// distance test are better than coordinates comparisons // distance test are better than coordinates comparisons
// (i had problems with has_on and are_colinear_ordered_along_line_3, // (I had problems with has_on and are_colinear_ordered_along_line_3,
// because some points are constructed by intersection) // because some points are constructed by intersection)
const FT p1p2 = distance(p1,p2); const FT p1p2 = sq_distance(p1,p2);
const FT p1q1 = distance(p1,q1); const FT p1q1 = sq_distance(p1,q1);
const FT p2q1 = distance(p2,q1); const FT p2q1 = sq_distance(p2,q1);
const FT p1q2 = distance(p1,q2); const FT p1q2 = sq_distance(p1,q2);
const FT p2q2 = distance(p2,q2); const FT p2q2 = sq_distance(p2,q2);
if ( p1p2<p1q1 || p1p2<p2q1 ) // q1 is outside [p1,p2] if ( p1p2<p1q1 || p1p2<p2q1 ) // q1 is outside [p1,p2]
{ {
@ -89,7 +89,7 @@ intersection_triangle_segment_aux(const typename K::Segment_3 &s1,
return make_object(make_segment(q1,q2)); return make_object(make_segment(q1,q2));
} }
// return Object(); // unreachable return Object(); // unreachable code
} }