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

Qualify calls to min and max by CGAL::, otherwise 

we get ambiguities with std::min/max.
This commit is contained in:
Sylvain Pion 2007-11-05 19:05:13 +00:00
parent 3d34707058
commit fd2d8748e0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Alpha_shapes_2/include/CGAL/Alpha_shape_2.h
View File

@ -905,14 +905,14 @@ Alpha_shape_2<Dt>::initialize_interval_vertex_map()
// alpha_mid_v = (interval3.first != UNDEFINED) ?
// min BOOST_PREVENT_MACRO_SUBSTITUTION (alpha_mid_v, interval3.first):
// min BOOST_PREVENT_MACRO_SUBSTITUTION (alpha_mid_v, interval3.second);
// CGAL::min BOOST_PREVENT_MACRO_SUBSTITUTION (alpha_mid_v, interval3.first):
// CGAL::min BOOST_PREVENT_MACRO_SUBSTITUTION (alpha_mid_v, interval3.second);
// if (alpha_max_v != Infinity)
// {
// alpha_max_v = (interval3.third != Infinity) ?
// max BOOST_PREVENT_MACRO_SUBSTITUTION (alpha_max_v, interval3.third):
// CGAL::max BOOST_PREVENT_MACRO_SUBSTITUTION (alpha_max_v, interval3.third):
// Infinity;
// }
// }
@ -944,10 +944,10 @@ Alpha_shape_2<Dt>::initialize_interval_vertex_map()
alpha_f = find_interval(f);
// if we define singular as not incident to a 2-dimensional
// face
alpha_mid_v = min BOOST_PREVENT_MACRO_SUBSTITUTION (alpha_mid_v, alpha_f);
alpha_mid_v = CGAL::min BOOST_PREVENT_MACRO_SUBSTITUTION (alpha_mid_v, alpha_f);
if (alpha_max_v != Infinity)
alpha_max_v = max BOOST_PREVENT_MACRO_SUBSTITUTION (alpha_max_v, alpha_f);
alpha_max_v = CGAL::max BOOST_PREVENT_MACRO_SUBSTITUTION (alpha_max_v, alpha_f);
}
}
@ -1417,11 +1417,11 @@ Alpha_shape_2<Dt>::find_alpha_solid() const
{
Face_handle f = face_circ;
if (! is_infinite(f))
alpha_min_v = min BOOST_PREVENT_MACRO_SUBSTITUTION(find_interval(f),
alpha_min_v = CGAL::min BOOST_PREVENT_MACRO_SUBSTITUTION(find_interval(f),
alpha_min_v);
}
while (++face_circ != done);
alpha_solid = max BOOST_PREVENT_MACRO_SUBSTITUTION (alpha_min_v, alpha_solid);
alpha_solid = CGAL::max BOOST_PREVENT_MACRO_SUBSTITUTION (alpha_min_v, alpha_solid);
}
return alpha_solid;