diff --git a/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h b/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h index 31a3c8fcaf5..838d21b8049 100644 --- a/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h +++ b/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h @@ -905,14 +905,14 @@ Alpha_shape_2
::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
::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
::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;