From ff0d56db46269aa31aa43b7a9937d4b327604ad8 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 5 Mar 2024 07:27:57 +0000 Subject: [PATCH] Fix VC++ max --- .../CGAL/Isosurfacing_3/internal/dual_contouring_functors.h | 2 +- .../internal/topologically_correct_marching_cubes_functors.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/dual_contouring_functors.h b/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/dual_contouring_functors.h index 5bdfa8670d1..5d4e11ebe2b 100644 --- a/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/dual_contouring_functors.h +++ b/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/dual_contouring_functors.h @@ -103,7 +103,7 @@ bool cell_position_QEM(const typename Domain::cell_descriptor& c, #endif FT x_min, y_min, z_min, x_max, y_max, z_max; - x_min = y_min = z_min = std::numeric_limits::max(); // @todo domain.span() + x_min = y_min = z_min = (std::numeric_limits::max)(); // @todo domain.span() x_max = y_max = z_max = std::numeric_limits::lowest(); FT x(0), y(0), z(0); diff --git a/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/topologically_correct_marching_cubes_functors.h b/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/topologically_correct_marching_cubes_functors.h index 2333ef76bfe..0a33b5b8c49 100644 --- a/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/topologically_correct_marching_cubes_functors.h +++ b/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/topologically_correct_marching_cubes_functors.h @@ -950,7 +950,7 @@ private: for(int r=0; r::max(); + FT dist = (std::numeric_limits::max)(); unsigned int ci = get_c(i, r, c_); const FT u_edge = e_vert(ci, 0); const FT v_edge = e_vert(ci, 1);