Merge pull request #7880 from sloriot/BGL-workaround_clang18_error

workaround error with clang++-18
This commit is contained in:
Laurent Rineau 2023-11-29 17:18:47 +01:00
commit bbf5d0d05b
2 changed files with 3 additions and 6 deletions

View File

@ -5,8 +5,6 @@
#include <CGAL/use.h> #include <CGAL/use.h>
#include "test_Prefix.h" #include "test_Prefix.h"
#include <boost/numeric/conversion/cast.hpp>
#include <unordered_map> #include <unordered_map>
#include <unordered_set> #include <unordered_set>
#include <fstream> #include <fstream>
@ -80,7 +78,7 @@ void test_edge_iterators(const Graph& g)
// do we iterate as many as that? // do we iterate as many as that?
edge_iterator eb, ee; edge_iterator eb, ee;
boost::tie(eb, ee) = edges(fg); boost::tie(eb, ee) = edges(fg);
assert(boost::numeric_cast<edges_size_type>(std::distance(eb, ee)) == num_edges(g)); assert(static_cast<edges_size_type>(std::distance(eb, ee)) == num_edges(g));
id_map ids; id_map ids;
unsigned int count = 0; unsigned int count = 0;
for(boost::tie(eb, ee) = edges(fg); eb != ee; ++eb) { for(boost::tie(eb, ee) = edges(fg); eb != ee; ++eb) {

View File

@ -2,7 +2,6 @@
#include <CGAL/use.h> #include <CGAL/use.h>
#include <boost/numeric/conversion/cast.hpp>
#include <unordered_set> #include <unordered_set>
typedef std::unordered_set<std::size_t> id_map; typedef std::unordered_set<std::size_t> id_map;
@ -68,7 +67,7 @@ void test_halfedge_iterators(const G& g)
// do we iterate as many as that? // do we iterate as many as that?
halfedge_iterator hb, he; halfedge_iterator hb, he;
boost::tie(hb, he) = halfedges(g); boost::tie(hb, he) = halfedges(g);
assert(boost::numeric_cast<halfedges_size_type>(std::distance(hb, he)) == num_halfedges(g)); assert(static_cast<halfedges_size_type>(std::distance(hb, he)) == num_halfedges(g));
id_map ids; id_map ids;
unsigned int count = 0; unsigned int count = 0;
@ -94,7 +93,7 @@ void test_edge_iterators(const G& g)
// do we iterate as many as that? // do we iterate as many as that?
edge_iterator eb, ee; edge_iterator eb, ee;
boost::tie(eb, ee) = edges(g); boost::tie(eb, ee) = edges(g);
assert(boost::numeric_cast<edges_size_type>(std::distance(eb, ee)) == num_edges(g)); assert(static_cast<edges_size_type>(std::distance(eb, ee)) == num_edges(g));
id_map ids; id_map ids;
unsigned int count = 0; unsigned int count = 0;