From 00eb751dc16a3bb2188b2ecdb25faeb2e5e341c2 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 11 Jun 2015 15:54:42 +0200 Subject: [PATCH] Nasty compilation-error SFINAE does not work in that case, and the substitution error is a hard error. --- BGL/include/CGAL/boost/graph/helpers.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/BGL/include/CGAL/boost/graph/helpers.h b/BGL/include/CGAL/boost/graph/helpers.h index 5c525b10ec2..647683d585a 100644 --- a/BGL/include/CGAL/boost/graph/helpers.h +++ b/BGL/include/CGAL/boost/graph/helpers.h @@ -256,10 +256,9 @@ bool is_tetrahedron( typename boost::graph_traits::halfedge_descripto } template -bool is_valid( typename boost::graph_traits::halfedge_descriptor h, const FaceGraph& g) +bool is_valid_halfedge_descriptor( typename boost::graph_traits::halfedge_descriptor h, const FaceGraph& g) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; - typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits::face_descriptor face_descriptor; face_descriptor f = face(h,g); halfedge_descriptor done(h); @@ -280,7 +279,7 @@ bool is_valid( typename boost::graph_traits::halfedge_descriptor h, c } template -bool is_valid( typename boost::graph_traits::vertex_descriptor v, const FaceGraph& g) +bool is_valid_vertex_descriptor( typename boost::graph_traits::vertex_descriptor v, const FaceGraph& g) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; halfedge_descriptor h = halfedge(v,g), done(h); @@ -298,7 +297,7 @@ bool is_valid( typename boost::graph_traits::vertex_descriptor v, con } template -bool is_valid( typename boost::graph_traits::face_descriptor f, const FaceGraph& g) +bool is_valid_face_descriptor( typename boost::graph_traits::face_descriptor f, const FaceGraph& g) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -318,17 +317,17 @@ bool is_valid_polygon_mesh(const FaceGraph& g) typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits::face_descriptor face_descriptor; BOOST_FOREACH(vertex_descriptor v, vertices(g)){ - if(! is_valid(v,g)){ + if(! is_valid_vertex_descriptor(v,g)){ return false; } } BOOST_FOREACH(halfedge_descriptor h, halfedges(g)){ - if(! is_valid(h,g)){ + if(! is_valid_halfedge_descriptor(h,g)){ return false; } } BOOST_FOREACH(face_descriptor f, faces(g)){ - if(! is_valid(f,g)){ + if(! is_valid_face_descriptor(f,g)){ return false; } }