fix warnings and compilation errors

This commit is contained in:
Sébastien Loriot 2024-12-17 09:44:20 +01:00
parent b32558b87e
commit ce78896f96
2 changed files with 2 additions and 7 deletions

View File

@ -32,7 +32,6 @@ void test_cube()
using Point = typename K::Point_3; using Point = typename K::Point_3;
using Vector = typename K::Vector_3; using Vector = typename K::Vector_3;
using Mesh = CGAL::Surface_mesh<Point>;
using Grid = IS::Cartesian_grid_3<K>; using Grid = IS::Cartesian_grid_3<K>;
using Values = IS::Value_function_3<Grid>; using Values = IS::Value_function_3<Grid>;
using Domain = IS::Marching_cubes_domain_3<Grid, Values>; using Domain = IS::Marching_cubes_domain_3<Grid, Values>;
@ -40,8 +39,6 @@ void test_cube()
using Point_range = std::vector<Point>; using Point_range = std::vector<Point>;
using Polygon_range = std::vector<std::vector<std::size_t> >; using Polygon_range = std::vector<std::vector<std::size_t> >;
using Mesh = CGAL::Surface_mesh<Point>;
auto implicit_function = [](const Point& q) -> FT auto implicit_function = [](const Point& q) -> FT
{ {
// --- // ---

View File

@ -32,7 +32,7 @@ template <typename PolygonMesh>
std::size_t connected_components(PolygonMesh& mesh) std::size_t connected_components(PolygonMesh& mesh)
{ {
using face_descriptor = typename boost::graph_traits<PolygonMesh>::face_descriptor; using face_descriptor = typename boost::graph_traits<PolygonMesh>::face_descriptor;
using FCCmap = typename PolygonMesh::Property_map<face_descriptor, std::size_t>; using FCCmap = typename PolygonMesh::template Property_map<face_descriptor, std::size_t>;
FCCmap fccmap = mesh.template add_property_map<face_descriptor, std::size_t>("f:CC").first; FCCmap fccmap = mesh.template add_property_map<face_descriptor, std::size_t>("f:CC").first;
@ -473,7 +473,6 @@ void compare_tmc_mc_trilinear(const std::array<typename KERNEL::FT, 8>& case_val
using Grid = IS::Cartesian_grid_3<K>; using Grid = IS::Cartesian_grid_3<K>;
using Values = IS::Interpolated_discrete_values_3<Grid>; using Values = IS::Interpolated_discrete_values_3<Grid>;
using Domain = IS::Marching_cubes_domain_3<Grid, Values>; using Domain = IS::Marching_cubes_domain_3<Grid, Values>;
using FT = typename K::FT;
using Point = typename K::Point_3; using Point = typename K::Point_3;
using Mesh = CGAL::Surface_mesh<Point>; using Mesh = CGAL::Surface_mesh<Point>;
using Point_range = std::vector<Point>; using Point_range = std::vector<Point>;
@ -529,13 +528,12 @@ void compare_tmc_mc_trilinear(const std::array<typename KERNEL::FT, 8>& case_val
} }
template<typename KERNEL> template<typename KERNEL>
void assert_tmc(const std::array<typename KERNEL::FT, 8>& case_values, typename KERNEL::FT iso, int components, int euler, int boundaries) void assert_tmc(const std::array<typename KERNEL::FT, 8>& case_values, typename KERNEL::FT iso, std::size_t components, std::size_t euler, std::size_t boundaries)
{ {
using K = KERNEL; using K = KERNEL;
using Grid = IS::Cartesian_grid_3<K>; using Grid = IS::Cartesian_grid_3<K>;
using Values = IS::Interpolated_discrete_values_3<Grid>; using Values = IS::Interpolated_discrete_values_3<Grid>;
using Domain = IS::Marching_cubes_domain_3<Grid, Values>; using Domain = IS::Marching_cubes_domain_3<Grid, Values>;
using FT = typename K::FT;
using Point = typename K::Point_3; using Point = typename K::Point_3;
using Mesh = CGAL::Surface_mesh<Point>; using Mesh = CGAL::Surface_mesh<Point>;
using Point_range = std::vector<Point>; using Point_range = std::vector<Point>;