From c68a6f77b6703fce51e1bca8d0ea7b2096cc09d5 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 28 May 2019 14:06:53 +0200
Subject: std::max conflict with windows macro

---
 src/Bottleneck_distance/include/gudhi/Neighbors_finder.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/Bottleneck_distance')

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
-- 
cgit v1.2.3