diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2019-06-05 08:24:57 +0200 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2019-06-05 08:24:57 +0200 |
| commit | e2f3158b8028b4df03aeb7cf7b50cf97db89de71 (patch) | |
| tree | 38de1de4ce79381fc029a78d1354ba34ad038c3a /src/Bottleneck_distance/include/gudhi/Neighbors_finder.h | |
| parent | ef407f0e40099a832f13371401b44ac565325aff (diff) | |
| parent | 7705d6ceac3d8a302b1950f77565f44a15122a30 (diff) | |
Merge branch 'master' into kernels
Diffstat (limited to 'src/Bottleneck_distance/include/gudhi/Neighbors_finder.h')
| -rw-r--r-- | src/Bottleneck_distance/include/gudhi/Neighbors_finder.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h b/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h index 36a63ea0..8c12d353 100644 --- a/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h +++ b/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h @@ -33,6 +33,7 @@ #include <unordered_set> #include <vector> #include <algorithm> // for std::max +#include <cmath> // for std::abs namespace Gudhi { @@ -45,7 +46,7 @@ struct Square_query { typedef Internal_point Point_d; typedef double FT; bool contains(Point_d p) const { - return std::max(std::abs(p.x()-c.x()), std::abs(p.y()-c.y())) <= size; + return (std::max)(std::abs(p.x()-c.x()), std::abs(p.y()-c.y())) <= size; } bool inner_range_intersects(CGAL::Kd_tree_rectangle<FT, D> const&r) const { return |