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

Merge pull request #4121 from janetournois/Mesh_3-fix_compilation_min_max_windows-jtournois 

Mesh_3 : add missing parenthesis around min and max for windows
This commit is contained in:
Laurent Rineau 2019-07-31 16:59:55 +02:00
parent da2726e0e7 49d526c1cf
commit 1e5bd7c8e4
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
View File

@ -138,7 +138,7 @@ protected:
, m_lock_ds(bbox, num_grid_cells_per_axis) , m_lock_ds(bbox, num_grid_cells_per_axis)
{ {
big_moves_current_size_ = 0; big_moves_current_size_ = 0;
big_moves_smallest_ = std::numeric_limits<FT>::max(); big_moves_smallest_ = (std::numeric_limits<FT>::max)();
} }
void update_big_moves(const FT& new_sq_move) void update_big_moves(const FT& new_sq_move)
@ -177,7 +177,7 @@ protected:
void clear_big_moves() void clear_big_moves()
{ {
big_moves_current_size_ = 0; big_moves_current_size_ = 0;
big_moves_smallest_ = std::numeric_limits<FT>::max(); big_moves_smallest_ = (std::numeric_limits<FT>::max)();
big_moves_.clear(); big_moves_.clear();
} }

18
Mesh_3/include/CGAL/Mesh_3/Worksharing_data_structures.h
View File

@ -160,11 +160,11 @@ public:
{ {
// Compute indices on grid // Compute indices on grid
int index_x = static_cast<int>( (to_double(point.x()) - m_xmin) * m_resolution_x); int index_x = static_cast<int>( (to_double(point.x()) - m_xmin) * m_resolution_x);
index_x = std::max( 0, std::min(index_x, m_num_grid_cells_per_axis - 1) ); index_x = (std::max)( 0, (std::min)(index_x, m_num_grid_cells_per_axis - 1) );
int index_y = static_cast<int>( (to_double(point.y()) - m_ymin) * m_resolution_y); int index_y = static_cast<int>( (to_double(point.y()) - m_ymin) * m_resolution_y);
index_y = std::max( 0, std::min(index_y, m_num_grid_cells_per_axis - 1) ); index_y = (std::max)( 0, (std::min)(index_y, m_num_grid_cells_per_axis - 1) );
int index_z = static_cast<int>( (to_double(point.z()) - m_zmin) * m_resolution_z); int index_z = static_cast<int>( (to_double(point.z()) - m_zmin) * m_resolution_z);
index_z = std::max( 0, std::min(index_z, m_num_grid_cells_per_axis - 1) ); index_z = (std::max)( 0, (std::min)(index_z, m_num_grid_cells_per_axis - 1) );
int index = int index =
index_z*m_num_grid_cells_per_axis*m_num_grid_cells_per_axis index_z*m_num_grid_cells_per_axis*m_num_grid_cells_per_axis
@ -646,16 +646,16 @@ protected:
int index_x = cell_index; int index_x = cell_index;
// For each cell inside the square // For each cell inside the square
for (int i = std::max(0, index_x-occupation_radius) ; for (int i = (std::max)(0, index_x-occupation_radius) ;
i <= std::min(m_num_cells_per_axis - 1, index_x+occupation_radius) ; i <= (std::min)(m_num_cells_per_axis - 1, index_x+occupation_radius) ;
++i) ++i)
{ {
for (int j = std::max(0, index_y-occupation_radius) ; for (int j = (std::max)(0, index_y-occupation_radius) ;
j <= std::min(m_num_cells_per_axis - 1, index_y+occupation_radius) ; j <= (std::min)(m_num_cells_per_axis - 1, index_y+occupation_radius) ;
++j) ++j)
{ {
for (int k = std::max(0, index_z-occupation_radius) ; for (int k = (std::max)(0, index_z-occupation_radius) ;
k <= std::min(m_num_cells_per_axis - 1, index_z+occupation_radius) ; k <= (std::min)(m_num_cells_per_axis - 1, index_z+occupation_radius) ;
++k) ++k)
{ {
int index = int index =