diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2019-05-28 14:06:53 +0200 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2019-05-28 14:06:53 +0200 |
| commit | c68a6f77b6703fce51e1bca8d0ea7b2096cc09d5 (patch) | |
| tree | 9ca67ae2f434d5c961b98e1b8ddc78d116fbff61 /src/Bottleneck_distance | |
| parent | 03093c5c6f26b6693ac091ed4cf6b28cd3519965 (diff) | |
std::max conflict with windows macro
Diffstat (limited to 'src/Bottleneck_distance')
| -rw-r--r-- | src/Bottleneck_distance/include/gudhi/Neighbors_finder.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h b/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h index 8777cd8d..8c12d353 100644 --- a/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h +++ b/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h @@ -30,9 +30,6 @@ #include <gudhi/Persistence_graph.h> #include <gudhi/Internal_point.h> -// Specific for Windows -#define NOMINMAX - #include <unordered_set> #include <vector> #include <algorithm> // for std::max @@ -49,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 |