Merge branch 'releases/CGAL-4.14-branch'

acmzn · Jul 31, 2019 · a0ea4f0 · a0ea4f0
2 parents 7b1889b + 862ee82
commit a0ea4f0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/Installation/cmake/modules/CGAL_add_test.cmake b/Installation/cmake/modules/CGAL_add_test.cmake
@@ -104,6 +104,8 @@ function(cgal_add_compilation_test exe_name)
   if(NOT TEST check_build_system)
     add_test(NAME "check_build_system"
       COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target "cgal_check_build_system")
+    set_property(TEST "check_build_system"
+      APPEND PROPERTY LABELS "Installation")
     if(POLICY CMP0066) # cmake 3.7 or later
       set_property(TEST "check_build_system"
         PROPERTY FIXTURES_SETUP "check_build_system_SetupFixture")

diff --git a/Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h b/Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
@@ -138,7 +138,7 @@ class Mesh_global_optimizer_base<Tr, Parallel_tag>
     , m_lock_ds(bbox, num_grid_cells_per_axis)
   {
     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)
@@ -177,7 +177,7 @@ class Mesh_global_optimizer_base<Tr, Parallel_tag>
   void clear_big_moves()
   {
     big_moves_current_size_ = 0;
-    big_moves_smallest_ = std::numeric_limits<FT>::max();
+    big_moves_smallest_ = (std::numeric_limits<FT>::max)();
     big_moves_.clear();
   }
 

diff --git a/Mesh_3/include/CGAL/Mesh_3/Worksharing_data_structures.h b/Mesh_3/include/CGAL/Mesh_3/Worksharing_data_structures.h
@@ -160,11 +160,11 @@ class Work_statistics
   {
     // Compute indices on grid
     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);
-    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);
-    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 =
       index_z*m_num_grid_cells_per_axis*m_num_grid_cells_per_axis
@@ -646,16 +646,16 @@ class Load_based_worksharing_ds
     int index_x = cell_index;
 
     // For each cell inside the square
-    for (int i = std::max(0, index_x-occupation_radius) ;
-          i <= std::min(m_num_cells_per_axis - 1, 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)
     {
-      for (int j = std::max(0, index_y-occupation_radius) ;
-            j <= std::min(m_num_cells_per_axis - 1, 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)
       {
-        for (int k = std::max(0, index_z-occupation_radius) ;
-              k <= std::min(m_num_cells_per_axis - 1, 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)
         {
           int index =

diff --git a/Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt b/Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
@@ -1,7 +1,6 @@
 # This is the CMake script for compiling the CGAL Mesh_3 demo implicit functions.
 
 cmake_minimum_required(VERSION 3.1...3.15)
-project( Mesh_3_implicit_functions )
 
 include( polyhedron_demo_macros )