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

fixed compilation warnings on visual compiler by adding CGAL:: before min and max global functions.

This commit is contained in:
Baruch Zukerman 2006-03-19 12:16:51 +00:00
parent ea2d5e06d2
commit 9dd9d78ab1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2.C
View File

@ -62,13 +62,13 @@ Number_type prec;
Number_type min(const Number_type & p, const Number_type & q, Number_type & r) Number_type min(const Number_type & p, const Number_type & q, Number_type & r)
{ {
return(p > q ? min(q,r) : min(p,r)); return(p > q ? CGAL::min(q,r) : CGAL::min(p,r));
} }
Number_type max(const Number_type & p,const Number_type & q, Number_type max(const Number_type & p,const Number_type & q,
const Number_type & r) const Number_type & r)
{ {
return(p > q ? max(p,r) : max(q,r)); return(p > q ? CGAL::max(p,r) : CGAL::max(q,r));
} }
void get_extreme_points(std::list<Segment_2> &seg_list, void get_extreme_points(std::list<Segment_2> &seg_list,
@ -79,10 +79,10 @@ void get_extreme_points(std::list<Segment_2> &seg_list,
{ {
std::list<Segment_2>::iterator iter = seg_list.begin(); std::list<Segment_2>::iterator iter = seg_list.begin();
min_x = min(iter->source().x(),iter->target().x()); min_x = CGAL::min(iter->source().x(),iter->target().x());
max_x = max(iter->source().x(),iter->target().x()); max_x = CGAL::max(iter->source().x(),iter->target().x());
min_y = min(iter->source().y(),iter->target().y()); min_y = CGAL::min(iter->source().y(),iter->target().y());
max_y = max(iter->source().y(),iter->target().y()); max_y = CGAL::max(iter->source().y(),iter->target().y());
for(++iter;iter != seg_list.end();++iter) { for(++iter;iter != seg_list.end();++iter) {
min_x = min(iter->source().x(),iter->target().x(),min_x); min_x = min(iter->source().x(),iter->target().x(),min_x);