songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pacify MSVC (min/max issues)

This commit is contained in:
Efi Fogel 2025-10-23 09:16:33 +03:00
parent e7682069fe
commit 909cbce367
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Arrangement_on_surface_2/include/CGAL/Arr_linear_traits_2.h
View File

@ -1590,7 +1590,7 @@ public:
auto ymin = bbox.ymin(); auto ymin = bbox.ymin();
auto xmax = bbox.xmax(); auto xmax = bbox.xmax();
auto ymax = bbox.ymax(); auto ymax = bbox.ymax();
Approximate_kernel::Iso_rectangle_2 rect(xmin, ymin, xmax, ymax); Approximate_kernel::Iso_rectangle_2 rect(xmin, ymin, xmax, ymax);
if (xcv.is_ray()) { if (xcv.is_ray()) {
auto ray = xcv.ray(); auto ray = xcv.ray();
Kernel kernel; Kernel kernel;
@ -1601,8 +1601,8 @@ public:
if (! result) return oi; if (! result) return oi;
if (const auto* res_seg = std::get_if<Approx_seg>(&*result)) { if (const auto* res_seg = std::get_if<Approx_seg>(&*result)) {
*oi++ = l2r ? res_seg->min() : res_seg->max(); *oi++ = l2r ? (res_seg->min)() : (res_seg->max)();
*oi++ = l2r ? res_seg->max() : res_seg->min(); *oi++ = l2r ? (res_seg->max)() : (res_seg->min)();
return oi; return oi;
} }
const auto* res_pnt = std::get_if<Approx_pnt>(&*result); const auto* res_pnt = std::get_if<Approx_pnt>(&*result);
@ -1613,15 +1613,15 @@ public:
if (xcv.is_line()) { if (xcv.is_line()) {
const Line_2 & supp_line = xcv.supp_line(); const Line_2 & supp_line = xcv.supp_line();
Approx_lin approx_supp_line( Approx_lin approx_supp_line(
CGAL::to_double(supp_line.a()), CGAL::to_double(supp_line.a()),
CGAL::to_double(supp_line.b()), CGAL::to_double(supp_line.b()),
CGAL::to_double(supp_line.c())); CGAL::to_double(supp_line.c()));
const auto result = CGAL::intersection(rect, approx_supp_line); const auto result = CGAL::intersection(rect, approx_supp_line);
if (! result) return oi; if (! result) return oi;
if (const auto* res_seg = std::get_if<Approx_seg>(&*result)) { if (const auto* res_seg = std::get_if<Approx_seg>(&*result)) {
*oi++ = l2r ? res_seg->min() : res_seg->max(); *oi++ = l2r ? (res_seg->min)() : (res_seg->max)();
*oi++ = l2r ? res_seg->max() : res_seg->min(); *oi++ = l2r ? (res_seg->max)() : (res_seg->min)();
return oi; return oi;
} }
const auto* res_pnt = std::get_if<Approx_pnt>(&*result); const auto* res_pnt = std::get_if<Approx_pnt>(&*result);
@ -1634,8 +1634,8 @@ public:
if (! result) return oi; if (! result) return oi;
if (const auto* res_seg = std::get_if<Approx_seg>(&*result)) { if (const auto* res_seg = std::get_if<Approx_seg>(&*result)) {
*oi++ = l2r ? res_seg->min() : res_seg->max(); *oi++ = l2r ? (res_seg->min)() : (res_seg->max)();
*oi++ = l2r ? res_seg->max() : res_seg->min(); *oi++ = l2r ? (res_seg->max)() : (res_seg->min)();
return oi; return oi;
} }
const auto* res_pnt = std::get_if<Approx_pnt>(&*result); const auto* res_pnt = std::get_if<Approx_pnt>(&*result);