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

Fix max() Windows error

This commit is contained in:
Simon Giraudot 2021-03-11 08:32:30 +01:00
parent b22bd4e498
commit ea17a54671
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Orthtree/include/CGAL/Orthtree.h
View File

@ -201,10 +201,10 @@ public:
{ {
Array bbox_min; Array bbox_min;
for (FT& f : bbox_min) for (FT& f : bbox_min)
f = std::numeric_limits<FT>::max(); f = (std::numeric_limits<FT>::max)();
Array bbox_max; Array bbox_max;
for (FT& f : bbox_max) for (FT& f : bbox_max)
f = -std::numeric_limits<FT>::max(); f = -(std::numeric_limits<FT>::max)();
for (const Range_type& r : point_range) for (const Range_type& r : point_range)
{ {
@ -555,7 +555,7 @@ public:
OutputIterator nearest_neighbors (const Point& query, OutputIterator nearest_neighbors (const Point& query,
std::size_t k, std::size_t k,
OutputIterator output) const { OutputIterator output) const {
Sphere query_sphere (query, std::numeric_limits<FT>::max()); Sphere query_sphere (query, (std::numeric_limits<FT>::max)());
return nearest_k_neighbors_in_radius(query_sphere, k, output); return nearest_k_neighbors_in_radius(query_sphere, k, output);
} }
@ -573,7 +573,7 @@ public:
OutputIterator nearest_neighbors (const Sphere& query, OutputIterator output) const { OutputIterator nearest_neighbors (const Sphere& query, OutputIterator output) const {
Sphere query_sphere = query; Sphere query_sphere = query;
return nearest_k_neighbors_in_radius(query_sphere, return nearest_k_neighbors_in_radius(query_sphere,
std::numeric_limits<std::size_t>::max(), output); (std::numeric_limits<std::size_t>::max)(), output);
} }
/*! /*!