From f9df1e23570996e9eb87366d2015e2deebfebd69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 7 Jun 2017 16:22:33 +0200 Subject: [PATCH] fix conversion warnings --- .../CGAL/boost/graph/Face_filtered_graph.h | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/BGL/include/CGAL/boost/graph/Face_filtered_graph.h b/BGL/include/CGAL/boost/graph/Face_filtered_graph.h index a05f3c968c1..34ac67e2edf 100644 --- a/BGL/include/CGAL/boost/graph/Face_filtered_graph.h +++ b/BGL/include/CGAL/boost/graph/Face_filtered_graph.h @@ -93,6 +93,12 @@ struct Face_filtered_graph typedef typename boost::graph_traits::edge_descriptor edge_descriptor; /// Face descriptor type typedef typename boost::graph_traits::face_descriptor face_descriptor; + /// Size type + #ifndef DOXYGEN_RUNNING + typedef boost::dynamic_bitset<>::size_type size_type; + #else + typedef unspecified_type size_type; + #endif // non documented types typedef typename boost::property_traits< FIMap >::value_type face_index_type; @@ -376,20 +382,17 @@ struct Face_filtered_graph return selected_halfedges[get(himap, h)]; } ///returns the number of selected faces - typename boost::graph_traits:: - faces_size_type number_of_faces()const + size_type number_of_faces()const { return selected_faces.count(); } ///returns the number of selected vertices. - typename boost::graph_traits:: - vertices_size_type number_of_vertices()const + size_type number_of_vertices()const { return selected_vertices.count(); } ///returns the number of selected halfedges. - typename boost::graph_traits:: - halfedges_size_type number_of_halfedges()const + size_type number_of_halfedges()const { return selected_halfedges.count(); } @@ -544,10 +547,10 @@ struct graph_traits< CGAL::Face_filtered_graph > typedef typename BGTG::directed_category directed_category; typedef typename BGTG::edge_parallel_category edge_parallel_category; typedef typename BGTG::traversal_category traversal_category; - typedef typename BGTG::vertices_size_type vertices_size_type; - typedef typename BGTG::edges_size_type edges_size_type; - typedef typename BGTG::halfedges_size_type halfedges_size_type; - typedef typename BGTG::faces_size_type faces_size_type; + typedef typename boost::dynamic_bitset<>::size_type vertices_size_type; + typedef typename boost::dynamic_bitset<>::size_type edges_size_type; + typedef typename boost::dynamic_bitset<>::size_type halfedges_size_type; + typedef typename boost::dynamic_bitset<>::size_type faces_size_type; typedef typename BGTG::degree_size_type degree_size_type; static vertex_descriptor null_vertex() @@ -633,7 +636,7 @@ template -typename boost::graph_traits::vertices_size_type +typename Face_filtered_graph::size_type num_vertices(const Face_filtered_graph& w) { return w.number_of_vertices(); @@ -643,7 +646,7 @@ template -typename boost::graph_traits::edges_size_type +typename Face_filtered_graph::size_type num_edges(const Face_filtered_graph& w) { return w.number_of_halfedges()/2; @@ -679,7 +682,8 @@ out_degree(typename boost::graph_traits& w) { CGAL_assertion(in_CC(v, w)); - return std::distance(out_edges(v, w).first ,out_edges(v, w).second); + return static_cast::degree_size_type>( + std::distance(out_edges(v, w).first ,out_edges(v, w).second) ); } template& w) { CGAL_assertion(in_CC(v, w)); - return std::distance(in_edges(v, w).first ,in_edges(v, w).second); + return static_cast::degree_size_type>( + std::distance(in_edges(v, w).first ,in_edges(v, w).second) ); } template -typename boost::graph_traits::halfedges_size_type +typename Face_filtered_graph::size_type num_halfedges(const Face_filtered_graph & w) { return w.number_of_halfedges(); @@ -1040,7 +1045,7 @@ template -typename boost::graph_traits::vertices_size_type +typename Face_filtered_graph::size_type num_faces(const Face_filtered_graph & w) { return w.number_of_faces();