diff --git a/Convex_hull_3/include/CGAL/convex_hull_3.h b/Convex_hull_3/include/CGAL/convex_hull_3.h index f29610480c9..1e3dac78202 100644 --- a/Convex_hull_3/include/CGAL/convex_hull_3.h +++ b/Convex_hull_3/include/CGAL/convex_hull_3.h @@ -309,7 +309,7 @@ void coplanar_3_hull(InputIterator first, InputIterator beyond, } } - std::vector::vertex_descriptor> vertices(CH_2.size()); + std::vector::vertex_descriptor> vertices(CH_2.size()); BOOST_FOREACH(const Point_3& p, CH_2){ vertices.push_back(add_vertex(p,P)); } diff --git a/Convex_hull_3/include/CGAL/convexity_check_3.h b/Convex_hull_3/include/CGAL/convexity_check_3.h index 717fad11c2a..a4ea10f0951 100644 --- a/Convex_hull_3/include/CGAL/convexity_check_3.h +++ b/Convex_hull_3/include/CGAL/convexity_check_3.h @@ -76,9 +76,9 @@ bool is_locally_convex(Polyhedron P, Vpmap vpmap, Facet_handle f_hdl, const Trai template bool is_strongly_convex_3(const Polyhedron& P, const Traits& traits) { - typedef boost::graph_traits::face_descriptor face_descriptor; - typedef boost::graph_traits::vertex_iterator vertex_iterator; - typedef boost::graph_traits::face_iterator face_iterator; + typedef typename boost::graph_traits::face_descriptor face_descriptor; + typedef typename boost::graph_traits::vertex_iterator vertex_iterator; + typedef typename boost::graph_traits::face_iterator face_iterator; typedef typename Traits::Point_3 Point_3; typedef typename Traits::Ray_3 Ray_3; @@ -213,17 +213,16 @@ bool all_points_inside( ForwardIterator first, const Traits& traits) { typedef typename Traits::Plane_3 Plane_3; - typedef typename boost::graph_traits::face_descriptor face_descriptor; typename Traits::Has_on_positive_side_3 has_on_positive_side = traits.has_on_positive_side_3_object(); for (ForwardIterator p_it = first; p_it != last; p_it++) { - Facet_iterator f_it; BOOST_FOREACH(face_descriptor fd, faces(P)) { Plane_3 plane; - get_plane2(P,plane, f_it); + get_plane2(P,plane, fd); if (has_on_positive_side(plane,*p_it)){ return false; } diff --git a/Convex_hull_3/include/CGAL/star_to_face_graph.h b/Convex_hull_3/include/CGAL/star_to_face_graph.h index 01a910ef59d..5c91f602346 100644 --- a/Convex_hull_3/include/CGAL/star_to_face_graph.h +++ b/Convex_hull_3/include/CGAL/star_to_face_graph.h @@ -58,7 +58,7 @@ void star_to_face_graph(const Triangulation_3& t, if(no_infinite_faces && t.is_infinite(vhj)){ infinite_face = true; } else { - std::pair res + std::pair res = vertex_map.insert(std::make_pair(vhj,nullvertex)); if(res.second){ res.first->second = add_vertex(vhj->point(), fg);