From fa72bc0f01b91167db3ba88e1dc0f64206e958d8 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Thu, 27 Oct 2016 17:55:40 +0200 Subject: [PATCH] replace std::max by (std::max) for windows same for min --- STL_Extension/include/CGAL/Spatial_lock_grid_3.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/STL_Extension/include/CGAL/Spatial_lock_grid_3.h b/STL_Extension/include/CGAL/Spatial_lock_grid_3.h index 9fc2034da79..cfe3ed75d9f 100644 --- a/STL_Extension/include/CGAL/Spatial_lock_grid_3.h +++ b/STL_Extension/include/CGAL/Spatial_lock_grid_3.h @@ -143,16 +143,16 @@ public: std::vector locked_cells_tmp; // For each cell inside the square - for (int i = std::max(0, index_x-lock_radius) ; - i <= std::min(m_num_grid_cells_per_axis - 1, index_x+lock_radius) ; + for (int i = (std::max)(0, index_x-lock_radius) ; + i <= (std::min)(m_num_grid_cells_per_axis - 1, index_x+lock_radius) ; ++i) { - for (int j = std::max(0, index_y-lock_radius) ; - j <= std::min(m_num_grid_cells_per_axis - 1, index_y+lock_radius) ; + for (int j = (std::max)(0, index_y-lock_radius) ; + j <= (std::min)(m_num_grid_cells_per_axis - 1, index_y+lock_radius) ; ++j) { - for (int k = std::max(0, index_z-lock_radius) ; - k <= std::min(m_num_grid_cells_per_axis - 1, index_z+lock_radius) ; + for (int k = (std::max)(0, index_z-lock_radius) ; + k <= (std::min)(m_num_grid_cells_per_axis - 1, index_z+lock_radius) ; ++k) { int index_to_lock =