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

replace std::max by (std::max) for windows 

same for min
This commit is contained in:
Jane Tournois 2016-10-27 17:55:40 +02:00
parent 1c400420ce
commit fa72bc0f01
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
STL_Extension/include/CGAL/Spatial_lock_grid_3.h
View File

@ -143,16 +143,16 @@ public:
std::vector<int> 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 =