From e9d41d7b7d284293ea456d4221a811c573a9ce89 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Tue, 21 Apr 2020 10:03:00 +0200 Subject: [PATCH 1/4] Fixes for min/max --- AABB_tree/demo/AABB_tree/Scene.cpp | 10 ++++----- AABB_tree/demo/AABB_tree/Scene.h | 2 +- .../ArrangementDemoGraphicsView.cpp | 8 +++---- .../CGAL/Curved_kernel_via_analysis_2/Arc_2.h | 8 +++---- .../gfx/Curve_renderer_2.h | 6 ++--- BGL/include/CGAL/boost/graph/selection.h | 2 +- .../test_extensive/stability/stability.cpp | 4 ++-- .../demo/CGAL_ipelets/alpha_shapes.cpp | 2 +- CGAL_ipelets/demo/CGAL_ipelets/skeleton.cpp | 2 +- .../Feature/Cluster_vertical_extent.h | 4 ++-- .../CGAL/Classification/Feature/Elevation.h | 6 ++--- .../Classification/Feature/Height_above.h | 4 ++-- .../Classification/Feature/Height_below.h | 4 ++-- .../Classification/Feature/Vertical_range.h | 8 +++---- .../CGAL/Classification/compressed_float.h | 8 +++---- .../include/CGAL/Combinatorial_map.h | 6 ++--- .../Coplanar_side_of_bounded_circle_3.h | 2 +- .../include/CGAL/Generalized_map.h | 6 ++--- .../heat_method_surface_mesh.cpp | 8 +++---- .../Heat_method_3/heat_method_concept.cpp | 6 ++--- .../heat_method_surface_mesh_direct_test.cpp | 10 ++++----- .../heat_method_surface_mesh_test.cpp | 10 ++++----- .../demo/Hyperbolic_triangulation_2/HDT2.cpp | 2 +- .../config/testfiles/CGAL_CFG_NO_LIMITS.cpp | 2 +- Kernel_23/include/CGAL/Dimension.h | 2 +- .../surface_mesh/IO_off.cpp | 4 ++-- .../surface_mesh/Vector.h | 4 ++-- .../cgogn_performance_3.h | 2 +- .../Linear_cell_complex_3/lcc_performance_3.h | 2 +- .../openvolumemesh_performance.h | 2 +- .../applications/CGAL/min_dihedral_angle.h | 20 ++++++++--------- Mesh_3/include/CGAL/Mesh_3/Sizing_grid.h | 2 +- .../Visual_hull/Nef_3/visual_hull_creator.h | 4 ++-- Nef_3/include/CGAL/Nef_3/Infimaximal_box.h | 18 +++++++-------- Number_types/include/CGAL/Quotient.h | 2 +- .../internal/fitness_function.h | 4 ++-- .../internal/optimize_2.h | 2 +- .../internal/population.h | 2 +- .../test_optimization_algorithms.cpp | 2 +- .../CGAL/draw_periodic_2_triangulation_2.h | 4 ++-- .../CGAL/Periodic_3_mesh_3/IO/File_medit.h | 12 +++++----- .../test_triply_periodic_minimal_surfaces.cpp | 22 +++++++++---------- .../CGAL/_test_periodic_3_static_filters.h | 12 +++++----- .../P4HDT2.cpp | 2 +- .../Periodic_4_hyperbolic_triangulation_2.h | 6 ++--- ...ABB_traversal_traits_with_transformation.h | 12 +++++----- .../internal/Snapping/snap.h | 4 ++-- .../internal/Snapping/snap_vertices.h | 2 +- .../include/CGAL/internal/hypothesis.h | 4 ++-- .../demo/Polyhedron/CGAL_double_edit.cpp | 4 ++-- Polyhedron/demo/Polyhedron/CGAL_double_edit.h | 2 +- Polyhedron/demo/Polyhedron/MainWindow.cpp | 6 ++--- Polyhedron/demo/Polyhedron/MainWindow.h | 2 +- .../Classification/Cluster_classification.cpp | 6 ++--- .../Point_set_item_classification.cpp | 6 ++--- .../Point_set_item_classification.h | 4 ++-- .../Surface_mesh_item_classification.cpp | 6 ++--- .../Plugins/PCA/Create_bbox_mesh_plugin.cpp | 6 ++--- .../Plugins/PCA/Scene_edit_box_item.cpp | 10 ++++----- .../Plugins/PMP/Engrave_text_plugin.cpp | 8 +++---- .../Surface_mesh/Mesh_segmentation_plugin.cpp | 2 +- .../Mesh_simplification_plugin.cpp | 2 +- .../Surface_mesh/Offset_meshing_plugin.cpp | 6 ++--- .../demo/Polyhedron/Scene_c3t3_item.cpp | 8 +++---- .../demo/Polyhedron/Scene_polylines_item.cpp | 2 +- .../include/CGAL/Polynomial/bezout_matrix.h | 4 ++-- .../test_efficient_RANSAC_generators.h | 4 ++-- .../include/CGAL/Straight_skeleton_2/test.h | 8 +++---- .../test/Stream_support/test_read_WKT.cpp | 6 ++--- .../test/Stream_support/test_write_WKT.cpp | 22 +++++++++---------- .../include/CGAL/Surface_mesh/Properties.h | 4 ++-- .../include/CGAL/Surface_mesh/Surface_mesh.h | 10 ++++----- .../CGAL/Variational_shape_approximation.h | 2 +- .../benchmark_shortest_paths.cpp | 8 +++---- .../Surface_mesh_shortest_path.h | 2 +- .../path_homotopy_with_schema.cpp | 6 ++--- .../Surface_mesh_topology/path_homotopy.cpp | 2 +- .../include/CGAL/Path_on_surface.h | 4 ++-- .../internal/Minimal_quadrangulation.h | 14 ++++++------ .../include/CGAL/draw_face_graph_with_paths.h | 6 ++--- .../path_with_rle_deformation_tests.cpp | 2 +- .../include/CGAL/enriched_polyhedron.h | 12 +++++----- .../CGAL/vtkSurfaceMesherContourFilter.h | 4 ++-- .../CGAL/internal/Combination_enumerator.h | 8 +++---- 84 files changed, 245 insertions(+), 245 deletions(-) diff --git a/AABB_tree/demo/AABB_tree/Scene.cpp b/AABB_tree/demo/AABB_tree/Scene.cpp index f96ac203526..b28368d39a6 100644 --- a/AABB_tree/demo/AABB_tree/Scene.cpp +++ b/AABB_tree/demo/AABB_tree/Scene.cpp @@ -855,8 +855,8 @@ void Scene::update_grid_size() } void Scene::generate_points_in(const unsigned int nb_points, - const double min, - const double max) + const double vmin, + const double vmax) { if(m_pPolyhedron == NULL) { @@ -875,7 +875,7 @@ void Scene::generate_points_in(const unsigned int nb_points, CGAL::Timer timer; timer.start(); std::cout << "Generate " << nb_points << " points in interval [" - << min << ";" << max << "]"; + << vmin << ";" << vmax << "]"; unsigned int nb_trials = 0; Vector vec = random_vector(); @@ -892,8 +892,8 @@ void Scene::generate_points_in(const unsigned int nb_points, if(nb_intersections % 2 != 0) signed_distance *= -1.0; - if(signed_distance >= min && - signed_distance <= max) + if(signed_distance >= vmin && + signed_distance <= vmax) { m_points.push_back(p); if(m_points.size()%(nb_points/10) == 0) diff --git a/AABB_tree/demo/AABB_tree/Scene.h b/AABB_tree/demo/AABB_tree/Scene.h index aad62368874..4e9fabd735b 100644 --- a/AABB_tree/demo/AABB_tree/Scene.h +++ b/AABB_tree/demo/AABB_tree/Scene.h @@ -192,7 +192,7 @@ public: void generate_boundary_points(const unsigned int nb_points); void generate_boundary_segments(const unsigned int nb_slices); void generate_points_in(const unsigned int nb_points, - const double min, const double max); + const double vmin, const double vmax); // algorithms/refine void refine_loop(); diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoGraphicsView.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoGraphicsView.cpp index 5c90d2b6f37..050a97e81df 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoGraphicsView.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoGraphicsView.cpp @@ -109,10 +109,10 @@ QRectF ArrangementDemoGraphicsView::getViewportRect( ) const QPointF p1 = this->mapToScene( 0, 0 ); QPointF p2 = this->mapToScene( this->width( ), this->height( ) ); - double xmin = std::min( p1.x( ), p2.x( ) ); - double xmax = std::max( p1.x( ), p2.x( ) ); - double ymin = std::min( p1.y( ), p2.y( ) ); - double ymax = std::max( p1.y( ), p2.y( ) ); + double xmin = (std::min)( p1.x( ), p2.x( ) ); + double xmax = (std::max)( p1.x( ), p2.x( ) ); + double ymin = (std::min)( p1.y( ), p2.y( ) ); + double ymax = (std::max)( p1.y( ), p2.y( ) ); QRectF res = QRectF( QPointF( xmin, ymin ), QPointF( xmax, ymax ) ); diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h index 62a1271d89f..f0fdab150de 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h @@ -3024,8 +3024,8 @@ public: y_dapprox = y_interval_for_curve_end(*this, CGAL::ARR_MIN_END, prec); // adapt y-interval - ymin = CGAL::min(ymin, y_dapprox.first); - ymax = CGAL::max(ymax, y_dapprox.second); + ymin = (CGAL::min)(ymin, y_dapprox.first); + ymax = (CGAL::max)(ymax, y_dapprox.second); // right end @@ -3105,9 +3105,9 @@ public: (curr_xy, prec); // adapt y-interval - ymin = CGAL::min(ymin, + ymin = (CGAL::min)(ymin, CGAL::to_double(xy_approx.first)); - ymax = CGAL::max(ymax, + ymax = (CGAL::max)(ymax, CGAL::to_double(xy_approx.second)); } } diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_2.h index 0bc77123f22..2389d8aea7b 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_2.h @@ -572,7 +572,7 @@ void draw(const Arc_2& arc, ref_bound = engine.pixel_h_r/CGAL_REFINE_X; #ifdef CGAL_CKVA_RENDER_WITH_REFINEMENT - ref_bound = std::min(ref_bound, Rational(CGAL_REFINE_DOUBLE_APPROX)); + ref_bound = (std::min)(ref_bound, Rational(CGAL_REFINE_DOUBLE_APPROX)); #endif Gfx_OUT("computing y-coordinates\n"); @@ -912,7 +912,7 @@ bool draw(const Point_2& pt, Coord_2& coord) { const Coordinate_1& x0 = pt.x(); Rational ref_bound = engine.pixel_w_r / 2; #ifdef CGAL_CKVA_RENDER_WITH_REFINEMENT - ref_bound = std::min(ref_bound, Rational(CGAL_REFINE_DOUBLE_APPROX)); + ref_bound = (std::min)(ref_bound, Rational(CGAL_REFINE_DOUBLE_APPROX)); #endif typename Curve_kernel_2::Algebraic_kernel_d_1::Approximate_relative_1 @@ -932,7 +932,7 @@ bool draw(const Point_2& pt, Coord_2& coord) { ref_bound = engine.pixel_h_r / CGAL_REFINE_X; #ifdef CGAL_CKVA_RENDER_WITH_REFINEMENT - ref_bound = std::min(ref_bound, Rational(CGAL_REFINE_DOUBLE_APPROX)); + ref_bound = (std::min)(ref_bound, Rational(CGAL_REFINE_DOUBLE_APPROX)); #endif Coordinate_2 xy(x0, pt.curve(), pt.arcno()); diff --git a/BGL/include/CGAL/boost/graph/selection.h b/BGL/include/CGAL/boost/graph/selection.h index 02949d5c3e3..3de9f92152b 100644 --- a/BGL/include/CGAL/boost/graph/selection.h +++ b/BGL/include/CGAL/boost/graph/selection.h @@ -140,7 +140,7 @@ struct Regularization_graph if (get(pmap.rg->is_selected_map, fd)) { if (pmap.rg->prevent_unselection) - out[0] = std::numeric_limits::max(); + out[0] = (std::numeric_limits::max)(); else out[0] = value; out[1] = 0.; diff --git a/Bounding_volumes/archive/test_extensive/stability/stability.cpp b/Bounding_volumes/archive/test_extensive/stability/stability.cpp index 419c50460c8..7b3c8673926 100644 --- a/Bounding_volumes/archive/test_extensive/stability/stability.cpp +++ b/Bounding_volumes/archive/test_extensive/stability/stability.cpp @@ -17,8 +17,8 @@ int nr = 0; double rerr(double exact,double approx) { const double e = std::abs((exact-approx)/exact); - mine = std::min(mine,e); - maxe = std::max(maxe,e); + mine = (std::min)(mine,e); + maxe = (std::max)(maxe,e); avge += e; ++nr; return e; diff --git a/CGAL_ipelets/demo/CGAL_ipelets/alpha_shapes.cpp b/CGAL_ipelets/demo/CGAL_ipelets/alpha_shapes.cpp index 64cf2296591..f5423b0ab19 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/alpha_shapes.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/alpha_shapes.cpp @@ -94,7 +94,7 @@ void ASphapeIpelet::protected_run(int fn) } - A.set_alpha(alpha==0?std::max(std::numeric_limits::epsilon(),A.get_nth_alpha(0)/2.): + A.set_alpha(alpha==0?(std::max)(std::numeric_limits::epsilon(),A.get_nth_alpha(0)/2.): (std::size_t) alpha==A.number_of_alphas()?A.get_nth_alpha(alpha-1)+1:A.get_nth_alpha(alpha-1)/2.+A.get_nth_alpha(alpha)/2.); for ( Alpha_shape_2::Alpha_shape_edges_iterator it=A.alpha_shape_edges_begin();it!=A.alpha_shape_edges_end();++it) draw_in_ipe(A.segment(*it)); diff --git a/CGAL_ipelets/demo/CGAL_ipelets/skeleton.cpp b/CGAL_ipelets/demo/CGAL_ipelets/skeleton.cpp index 3d25728ee5a..7d2026c5981 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/skeleton.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/skeleton.cpp @@ -105,7 +105,7 @@ void SkeletonIpelet::protected_run(int fn) std::list offsets; //~ "Interior skeleton", "Exterior skeleton","Interior offset","Exterior offset","Interior offsets","Exterior offsets", "Help" SkeletonPtr ss; - double max_edge=std::max((bbox.xmax()-bbox.xmin()),(bbox.ymax()-bbox.ymin())); + double max_edge=(std::max)((bbox.xmax()-bbox.xmin()),(bbox.ymax()-bbox.ymin())); double dist=0.; int ret_val=-1; switch(fn){ diff --git a/Classification/include/CGAL/Classification/Feature/Cluster_vertical_extent.h b/Classification/include/CGAL/Classification/Feature/Cluster_vertical_extent.h index d57d8e7d10b..ed977c52da6 100644 --- a/Classification/include/CGAL/Classification/Feature/Cluster_vertical_extent.h +++ b/Classification/include/CGAL/Classification/Feature/Cluster_vertical_extent.h @@ -58,8 +58,8 @@ public: m_values.reserve (clusters.size()); for (std::size_t i = 0; i < clusters.size(); ++ i) { - float min_z = std::numeric_limits::max(); - float max_z = -std::numeric_limits::min(); + float min_z = (std::numeric_limits::max)(); + float max_z = -(std::numeric_limits::min)(); for (std::size_t j = 0; j < clusters[i].size(); ++ j) { diff --git a/Classification/include/CGAL/Classification/Feature/Elevation.h b/Classification/include/CGAL/Classification/Feature/Elevation.h index e4158800ef2..1205c757403 100644 --- a/Classification/include/CGAL/Classification/Feature/Elevation.h +++ b/Classification/include/CGAL/Classification/Feature/Elevation.h @@ -88,7 +88,7 @@ public: Image_float dem(grid.width(),grid.height()); z_max = 0.f; - z_min = std::numeric_limits::max(); + z_min = (std::numeric_limits::max)(); for (std::size_t j = 0; j < grid.height(); ++ j) for (std::size_t i = 0; i < grid.width(); ++ i) @@ -100,8 +100,8 @@ public: for (typename Grid::iterator it = grid.indices_begin(i,j); it != end; ++ it) { float z = float(get(point_map, *(input.begin()+(*it))).z()); - z_min = (std::min(z_min, z)); - z_max = (std::max(z_max, z)); + z_min = ((std::min)(z_min, z)); + z_max = ((std::max)(z_max, z)); mean += z; ++ nb; } diff --git a/Classification/include/CGAL/Classification/Feature/Height_above.h b/Classification/include/CGAL/Classification/Feature/Height_above.h index a4cec436241..62eac6f20e2 100644 --- a/Classification/include/CGAL/Classification/Feature/Height_above.h +++ b/Classification/include/CGAL/Classification/Feature/Height_above.h @@ -81,13 +81,13 @@ public: for (std::size_t i = 0; i < grid.width(); ++ i) if (grid.has_points(i,j)) { - float z_max = -std::numeric_limits::max(); + float z_max = -(std::numeric_limits::max)(); typename Grid::iterator end = grid.indices_end(i,j); for (typename Grid::iterator it = grid.indices_begin(i,j); it != end; ++ it) { float z = float(get(point_map, *(input.begin()+(*it))).z()); - z_max = (std::max(z_max, z)); + z_max = ((std::max)(z_max, z)); } dtm(i,j) = z_max; diff --git a/Classification/include/CGAL/Classification/Feature/Height_below.h b/Classification/include/CGAL/Classification/Feature/Height_below.h index 421b7622c79..0eae37370f6 100644 --- a/Classification/include/CGAL/Classification/Feature/Height_below.h +++ b/Classification/include/CGAL/Classification/Feature/Height_below.h @@ -81,13 +81,13 @@ public: for (std::size_t i = 0; i < grid.width(); ++ i) if (grid.has_points(i,j)) { - float z_min = std::numeric_limits::max(); + float z_min = (std::numeric_limits::max)(); typename Grid::iterator end = grid.indices_end(i,j); for (typename Grid::iterator it = grid.indices_begin(i,j); it != end; ++ it) { float z = float(get(point_map, *(input.begin()+(*it))).z()); - z_min = (std::min(z_min, z)); + z_min = ((std::min)(z_min, z)); } dtm(i,j) = z_min; diff --git a/Classification/include/CGAL/Classification/Feature/Vertical_range.h b/Classification/include/CGAL/Classification/Feature/Vertical_range.h index 759fd4a274e..95fc5042e18 100644 --- a/Classification/include/CGAL/Classification/Feature/Vertical_range.h +++ b/Classification/include/CGAL/Classification/Feature/Vertical_range.h @@ -81,15 +81,15 @@ public: for (std::size_t i = 0; i < grid.width(); ++ i) if (grid.has_points(i,j)) { - float z_max = -std::numeric_limits::max(); - float z_min = std::numeric_limits::max(); + float z_max = -(std::numeric_limits::max)(); + float z_min = (std::numeric_limits::max)(); typename Grid::iterator end = grid.indices_end(i,j); for (typename Grid::iterator it = grid.indices_begin(i,j); it != end; ++ it) { float z = float(get(point_map, *(input.begin()+(*it))).z()); - z_max = (std::max(z_max, z)); - z_min = (std::min(z_min, z)); + z_max = ((std::max)(z_max, z)); + z_min = ((std::min)(z_min, z)); } dtm(i,j) = z_max - z_min; diff --git a/Classification/include/CGAL/Classification/compressed_float.h b/Classification/include/CGAL/Classification/compressed_float.h index be994de81de..07c7600d33c 100644 --- a/Classification/include/CGAL/Classification/compressed_float.h +++ b/Classification/include/CGAL/Classification/compressed_float.h @@ -40,15 +40,15 @@ typedef unsigned short compressed_float; typedef unsigned char compressed_float; # endif -inline compressed_float compress_float (const float& f, const float& min = 0.f, const float& max = 1.f) +inline compressed_float compress_float (const float& f, const float& fmin = 0.f, const float& fmax = 1.f) { return static_cast - (float(std::numeric_limits::max()) * (f - min) / (max - min)); + (float((std::numeric_limits::max)()) * (f - fmin) / (fmax - fmin)); } -inline float decompress_float (const compressed_float& t, const float& min = 0.f, const float& max = 1.f) +inline float decompress_float (const compressed_float& t, const float& fmin = 0.f, const float& fmax = 1.f) { - return ((max - min) * (t / float(std::numeric_limits::max())) + min); + return ((fmax - fmin) * (t / float((std::numeric_limits::max)())) + fmin); } #endif diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h index 538fc6fb7be..829296e124f 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h @@ -2631,7 +2631,7 @@ namespace CGAL { while (beta<1>(dd1)!=d2) { if (this->template is_free<2>(beta<1>(dd1))) - { return std::numeric_limits::max(); } + { return (std::numeric_limits::max)(); } ++res; dd1=beta<1, 2>(dd1); @@ -2653,7 +2653,7 @@ namespace CGAL { if (d2==beta<2>(d1)) { return 0; } if (this->template is_free<2>(d1) || this->template is_free<2>(d2)) - { return std::numeric_limits::max(); } + { return (std::numeric_limits::max)(); } d1=beta<2>(d1); d2=beta<2>(d2); @@ -2662,7 +2662,7 @@ namespace CGAL { while (beta<0>(dd1)!=d2) { if (this->template is_free<2>(beta<0>(dd1))) - { return std::numeric_limits::max(); } + { return (std::numeric_limits::max)(); } ++res; dd1=beta<0, 2>(dd1); diff --git a/Filtered_kernel/include/CGAL/internal/Static_filters/Coplanar_side_of_bounded_circle_3.h b/Filtered_kernel/include/CGAL/internal/Static_filters/Coplanar_side_of_bounded_circle_3.h index f940f7d815d..1cb46d265da 100644 --- a/Filtered_kernel/include/CGAL/internal/Static_filters/Coplanar_side_of_bounded_circle_3.h +++ b/Filtered_kernel/include/CGAL/internal/Static_filters/Coplanar_side_of_bounded_circle_3.h @@ -126,7 +126,7 @@ public: if (maxz < arz) maxz = arz; if (maxz < atz) maxz = atz; - double d = std::max(maxx, std::max(maxy, maxz)); + double d = (std::max)(maxx, (std::max)(maxy, maxz)); double eps = 3.27418e-11 * d * d * d * d * d * d; if (det > eps) return ON_BOUNDED_SIDE; diff --git a/Generalized_map/include/CGAL/Generalized_map.h b/Generalized_map/include/CGAL/Generalized_map.h index bec3b9a187f..cff816951ce 100644 --- a/Generalized_map/include/CGAL/Generalized_map.h +++ b/Generalized_map/include/CGAL/Generalized_map.h @@ -1734,7 +1734,7 @@ namespace CGAL { while (next(dd1)!=d2) { if (this->template is_free<2>(next(dd1))) - { return std::numeric_limits::max(); } + { return (std::numeric_limits::max)(); } ++res; dd1=opposite2(next(dd1)); @@ -1755,7 +1755,7 @@ namespace CGAL { if (d2==opposite2(d1)) { return 0; } if (this->template is_free<2>(d1) || this->template is_free<2>(d2)) - { return std::numeric_limits::max(); } + { return (std::numeric_limits::max)(); } d1=opposite2(d1); d2=opposite2(d2); @@ -1764,7 +1764,7 @@ namespace CGAL { while (previous(dd1)!=d2) { if (this->template is_free<2>(previous(dd1))) - { return std::numeric_limits::max(); } + { return (std::numeric_limits::max)(); } ++res; dd1=opposite2(previous(dd1)); diff --git a/Heat_method_3/examples/Heat_method_3/heat_method_surface_mesh.cpp b/Heat_method_3/examples/Heat_method_3/heat_method_surface_mesh.cpp index 8395eb6d72e..ca8fa43edc6 100644 --- a/Heat_method_3/examples/Heat_method_3/heat_method_surface_mesh.cpp +++ b/Heat_method_3/examples/Heat_method_3/heat_method_surface_mesh.cpp @@ -38,20 +38,20 @@ int main(int argc, char* argv[]) Point_3 sp = tm.point(source); std::cout << "source: " << sp << " " << source << std::endl; - vertex_descriptor far; + vertex_descriptor vfar; double sdistance = 0; for(vertex_descriptor vd : vertices(tm)){ std::cout << vd << " is at distance " << get(vertex_distance, vd) << " to " << source << std::endl; if(get(vertex_distance, vd) > sdistance){ - far = vd; + vfar = vd; sdistance = get(vertex_distance, vd); } } - std::cout << "far: " << tm.point(far) << " " << far << std::endl; + std::cout << "vfar: " << tm.point(vfar) << " " << vfar << std::endl; - hm.add_source(far); + hm.add_source(vfar); hm.estimate_geodesic_distances(vertex_distance); for(vertex_descriptor vd : vertices(tm)){ diff --git a/Heat_method_3/test/Heat_method_3/heat_method_concept.cpp b/Heat_method_3/test/Heat_method_3/heat_method_concept.cpp index 0767dcc38f7..1486ee4c075 100644 --- a/Heat_method_3/test/Heat_method_3/heat_method_concept.cpp +++ b/Heat_method_3/test/Heat_method_3/heat_method_concept.cpp @@ -42,19 +42,19 @@ int main() //Point_3 sp = sm.point(source); - vertex_descriptor far; + vertex_descriptor vfar; // double sdistance = 0; for(vertex_descriptor vd : vertices(sm)){ std::cout << vd << " is at distance " << get(heat_intensity, vd) << " from " << source << std::endl; /* if(squared_distance(sp,sm.point(vd)) > sdistance){ - far = vd; + vfar = vd; sdistance = squared_distance(sp,sm.point(vd)); } */ } - hm.add_source(far); + hm.add_source(vfar); hm.estimate_geodesic_distances(heat_intensity); for(vertex_descriptor vd : vertices(sm)){ diff --git a/Heat_method_3/test/Heat_method_3/heat_method_surface_mesh_direct_test.cpp b/Heat_method_3/test/Heat_method_3/heat_method_surface_mesh_direct_test.cpp index 75e09f5b024..1c6ec0d99d2 100644 --- a/Heat_method_3/test/Heat_method_3/heat_method_surface_mesh_direct_test.cpp +++ b/Heat_method_3/test/Heat_method_3/heat_method_surface_mesh_direct_test.cpp @@ -36,19 +36,19 @@ int main(int argc, char* argv[]) Point_3 sp = sm.point(source); std::cout << "source: " << sp << " " << source << std::endl; - vertex_descriptor far; + vertex_descriptor vfar; double sdistance = 0; for(vertex_descriptor vd : vertices(sm)){ if(get(vertex_distance,vd) > sdistance){ - far = vd; + vfar = vd; sdistance = get(vertex_distance,vd); } } assert(sdistance > 2.9); assert(sdistance < CGAL_PI); - hm.add_source(far); + hm.add_source(vfar); assert(hm.sources().size() == 2); hm.estimate_geodesic_distances(vertex_distance); @@ -62,7 +62,7 @@ int main(int argc, char* argv[]) assert(sdistance > 1.4); assert(sdistance < CGAL_PI/2.0); - hm.remove_source(far); + hm.remove_source(vfar); assert(hm.sources().size() == 1); hm.clear_sources(); @@ -70,7 +70,7 @@ int main(int argc, char* argv[]) // add range of sources std::vector vrange; vrange.push_back(source); - vrange.push_back(far); + vrange.push_back(vfar); hm.add_sources(vrange); assert(hm.sources().size() == 2); hm.estimate_geodesic_distances(vertex_distance); diff --git a/Heat_method_3/test/Heat_method_3/heat_method_surface_mesh_test.cpp b/Heat_method_3/test/Heat_method_3/heat_method_surface_mesh_test.cpp index 33a0ab4d111..44ef9fa6799 100644 --- a/Heat_method_3/test/Heat_method_3/heat_method_surface_mesh_test.cpp +++ b/Heat_method_3/test/Heat_method_3/heat_method_surface_mesh_test.cpp @@ -36,19 +36,19 @@ int main(int argc, char* argv[]) Point_3 sp = sm.point(source); std::cout << "source: " << sp << " " << source << std::endl; - vertex_descriptor far; + vertex_descriptor vfar; double sdistance = 0; for(vertex_descriptor vd : vertices(sm)){ if(get(vertex_distance,vd) > sdistance){ - far = vd; + vfar = vd; sdistance = get(vertex_distance,vd); } } assert(sdistance > 2.9); assert(sdistance < CGAL_PI); - hm.add_source(far); + hm.add_source(vfar); assert(hm.sources().size() == 2); hm.estimate_geodesic_distances(vertex_distance); @@ -62,7 +62,7 @@ int main(int argc, char* argv[]) assert(sdistance > 1.4); assert(sdistance < CGAL_PI/2.0); - hm.remove_source(far); + hm.remove_source(vfar); assert(hm.sources().size() == 1); hm.clear_sources(); @@ -70,7 +70,7 @@ int main(int argc, char* argv[]) // add range of sources std::vector vrange; vrange.push_back(source); - vrange.push_back(far); + vrange.push_back(vfar); hm.add_sources(vrange); assert(hm.sources().size() == 2); hm.estimate_geodesic_distances(vertex_distance); diff --git a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/HDT2.cpp b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/HDT2.cpp index 799db234f27..ccfb1d72a8e 100644 --- a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/HDT2.cpp +++ b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/HDT2.cpp @@ -318,7 +318,7 @@ MainWindow::on_actionInsertRandomPoints_triggered() tr("Enter number of random points"), 100, 0, - std::numeric_limits::max(), + (std::numeric_limits::max)(), 1, &ok); diff --git a/Installation/cmake/modules/config/testfiles/CGAL_CFG_NO_LIMITS.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_NO_LIMITS.cpp index f24d6a358f2..ba3f6dfd621 100644 --- a/Installation/cmake/modules/config/testfiles/CGAL_CFG_NO_LIMITS.cpp +++ b/Installation/cmake/modules/config/testfiles/CGAL_CFG_NO_LIMITS.cpp @@ -23,7 +23,7 @@ int main() { double d = std::numeric_limits::denorm_min(); - double e = std::numeric_limits::min(); + double e = (std::numeric_limits::min)(); // Note : denorm_min == min is actually not necessarily a bug. // So a better test should be found. if (d == 0 || d == e) diff --git a/Kernel_23/include/CGAL/Dimension.h b/Kernel_23/include/CGAL/Dimension.h index 1b62f8ca27f..196ed55b569 100644 --- a/Kernel_23/include/CGAL/Dimension.h +++ b/Kernel_23/include/CGAL/Dimension.h @@ -25,7 +25,7 @@ namespace CGAL { #ifdef CGAL_EIGEN3_ENABLED const int UNKNOWN_DIMENSION=Eigen::Dynamic; #else -const int UNKNOWN_DIMENSION=std::numeric_limits::max(); +const int UNKNOWN_DIMENSION=(std::numeric_limits::max)(); #endif // Check that dimension d1 is fine for a kernel of dimension d2. diff --git a/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/IO_off.cpp b/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/IO_off.cpp index bdae916e43f..9c7615c7d33 100644 --- a/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/IO_off.cpp +++ b/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/IO_off.cpp @@ -58,7 +58,7 @@ bool read_off_ascii(Surface_mesh& mesh, // #Vertice, #Faces, #Edges items = fscanf(in, "%d %d %d\n", (int*)&nV, (int*)&nF, (int*)&nE); mesh.clear(); - mesh.reserve(nV, std::max(3*nV, nE), nF); + mesh.reserve(nV, (std::max)(3*nV, nE), nF); // read vertices: pos [normal] [color] [texcoord] @@ -173,7 +173,7 @@ bool read_off_binary(Surface_mesh& mesh, read(in, nF); read(in, nE); mesh.clear(); - mesh.reserve(nV, std::max(3*nV, nE), nF); + mesh.reserve(nV, (std::max)(3*nV, nE), nF); // read vertices: pos [normal] [color] [texcoord] diff --git a/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/Vector.h b/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/Vector.h index 7274501b5f4..8f9487c28cc 100644 --- a/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/Vector.h +++ b/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/Vector.h @@ -210,7 +210,7 @@ public: Vector& normalize() { Scalar n = norm(*this); - if (n > std::numeric_limits::min()) + if (n > (std::numeric_limits::min)()) *this *= 1.0/n; return *this; } @@ -500,7 +500,7 @@ public: Vector& normalize() { Scalar n = norm(*this); - n = (n > std::numeric_limits::min()) ? 1.0/n : 0.0; + n = (n > (std::numeric_limits::min)()) ? 1.0/n : 0.0; x *= n; y *= n; z *= n; diff --git a/Linear_cell_complex/benchmark/Linear_cell_complex_3/cgogn_performance_3.h b/Linear_cell_complex/benchmark/Linear_cell_complex_3/cgogn_performance_3.h index b780ccd231d..fd91d3dde0a 100644 --- a/Linear_cell_complex/benchmark/Linear_cell_complex_3/cgogn_performance_3.h +++ b/Linear_cell_complex/benchmark/Linear_cell_complex_3/cgogn_performance_3.h @@ -63,7 +63,7 @@ private: Dart getShortestEdge() { - double weight = std::numeric_limits::max(); + double weight = (std::numeric_limits::max)(); Dart dart = NIL; bool boundary=false; diff --git a/Linear_cell_complex/benchmark/Linear_cell_complex_3/lcc_performance_3.h b/Linear_cell_complex/benchmark/Linear_cell_complex_3/lcc_performance_3.h index 1a901d1d34e..f16d3dd6243 100644 --- a/Linear_cell_complex/benchmark/Linear_cell_complex_3/lcc_performance_3.h +++ b/Linear_cell_complex/benchmark/Linear_cell_complex_3/lcc_performance_3.h @@ -319,7 +319,7 @@ private: Dart_handle getShortestEdge() { - double weight = std::numeric_limits::max(); + double weight = (std::numeric_limits::max)(); Dart_handle dart = lcc.null_dart_handle; int m=lcc.get_new_mark(); diff --git a/Linear_cell_complex/benchmark/Linear_cell_complex_3/openvolumemesh_performance.h b/Linear_cell_complex/benchmark/Linear_cell_complex_3/openvolumemesh_performance.h index 929d9ff8313..f9a30b83476 100644 --- a/Linear_cell_complex/benchmark/Linear_cell_complex_3/openvolumemesh_performance.h +++ b/Linear_cell_complex/benchmark/Linear_cell_complex_3/openvolumemesh_performance.h @@ -129,7 +129,7 @@ private: // Find the mesh's shortest edge EdgeHandle getShortestEdge() { - double max_weight = std::numeric_limits::max(); + double max_weight = (std::numeric_limits::max)(); EdgeHandle eh = Mesh::InvalidEdgeHandle; bool boundary=false; diff --git a/Mesh_3/archive/applications/CGAL/min_dihedral_angle.h b/Mesh_3/archive/applications/CGAL/min_dihedral_angle.h index b3594e4837b..2bbae4319dc 100644 --- a/Mesh_3/archive/applications/CGAL/min_dihedral_angle.h +++ b/Mesh_3/archive/applications/CGAL/min_dihedral_angle.h @@ -32,15 +32,15 @@ class Compute_min_angle operator()(const Cell_handle ch) const { double min_quotient = compute_quotient(ch, 0, 1, 2, 3); - min_quotient = std::min(min_quotient, + min_quotient = (std::min)(min_quotient, compute_quotient(ch, 0, 2, 1, 3)); - min_quotient = std::min(min_quotient, + min_quotient = (std::min)(min_quotient, compute_quotient(ch, 0, 3, 1, 2)); - min_quotient = std::min(min_quotient, + min_quotient = (std::min)(min_quotient, compute_quotient(ch, 1, 2, 0, 3)); - min_quotient = std::min(min_quotient, + min_quotient = (std::min)(min_quotient, compute_quotient(ch, 1, 3, 0, 2)); - min_quotient = std::min(min_quotient, + min_quotient = (std::min)(min_quotient, compute_quotient(ch, 2, 3, 0, 1)); const double volume = CGAL::to_double(tr.tetrahedron(ch).volume()); @@ -119,19 +119,19 @@ namespace CGAL { min_dihedral_angle_aux_compute_quotient(p0, p1, p2, p3, k); min_quotient = - std::min(min_quotient, + (std::min)(min_quotient, min_dihedral_angle_aux_compute_quotient(p0, p2, p1, p3, k)); min_quotient = - std::min(min_quotient, + (std::min)(min_quotient, min_dihedral_angle_aux_compute_quotient(p0, p3, p1, p2, k)); min_quotient = - std::min(min_quotient, + (std::min)(min_quotient, min_dihedral_angle_aux_compute_quotient(p1, p2, p0, p3, k)); min_quotient = - std::min(min_quotient, + (std::min)(min_quotient, min_dihedral_angle_aux_compute_quotient(p1, p3, p0, p2, k)); min_quotient = - std::min(min_quotient, + (std::min)(min_quotient, min_dihedral_angle_aux_compute_quotient(p2, p3, p0, p1, k)); // std::cerr << CGAL::sqrt(min_quotient) << " - " diff --git a/Mesh_3/include/CGAL/Mesh_3/Sizing_grid.h b/Mesh_3/include/CGAL/Mesh_3/Sizing_grid.h index 8969c9caf5f..9fe82752715 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Sizing_grid.h +++ b/Mesh_3/include/CGAL/Mesh_3/Sizing_grid.h @@ -443,7 +443,7 @@ private: pNode->ref_node(candidate.ref_node()); pNode->size() = candidate.size(); pNode->done() = true; - m_max_size = std::max(m_max_size,pNode->size()); + m_max_size = (std::max)(m_max_size,pNode->size()); // explore neighbors for(unsigned int index_neighbor = 0; diff --git a/Nef_3/archive/Visual_hull/Nef_3/visual_hull_creator.h b/Nef_3/archive/Visual_hull/Nef_3/visual_hull_creator.h index 244da5108ae..857c5af1736 100644 --- a/Nef_3/archive/Visual_hull/Nef_3/visual_hull_creator.h +++ b/Nef_3/archive/Visual_hull/Nef_3/visual_hull_creator.h @@ -87,9 +87,9 @@ class visual_hull_creator : public CGAL::Modifier_base { public: - visual_hull_creator(Point_3 min, Point_3 max, Point_3 position, + visual_hull_creator(Point_3 pmin, Point_3 pmax, Point_3 position, std::list > p) : - room_min(min), room_max(max), c_pos(position), polygon_list(p) { } + room_min(pmin), room_max(pmax), c_pos(position), polygon_list(p) { } /* void recompute_scene() { diff --git a/Nef_3/include/CGAL/Nef_3/Infimaximal_box.h b/Nef_3/include/CGAL/Nef_3/Infimaximal_box.h index 586527a21c5..75f7f378dac 100644 --- a/Nef_3/include/CGAL/Nef_3/Infimaximal_box.h +++ b/Nef_3/include/CGAL/Nef_3/Infimaximal_box.h @@ -375,24 +375,24 @@ class Infimaximal_box { C.create_vertices_of_box_with_plane(h, b); } - static void compute_min_max(const Plane_3& h, NT orth_coords[3], int& min, int& max) { + static void compute_min_max(const Plane_3& h, NT orth_coords[3], int& cmin, int& cmax) { Vector_3 orth = h.orthogonal_vector(); orth_coords[0] = CGAL_NTS abs(orth.hx()[0]); orth_coords[1] = CGAL_NTS abs(orth.hy()[0]); orth_coords[2] = CGAL_NTS abs(orth.hz()[0]); - max = 0; + cmax = 0; if(orth_coords[1] > orth_coords[0]) - max = 1; - if(orth_coords[2] > orth_coords[max]) - max = 2; + cmax = 1; + if(orth_coords[2] > orth_coords[cmax]) + cmax = 2; - min = 0; + cmin = 0; if(orth_coords[1] < orth_coords[0]) - min = 1; - if(orth_coords[2] < orth_coords[min]) - min = 2; + cmin = 1; + if(orth_coords[2] < orth_coords[cmin]) + cmin = 2; } template diff --git a/Number_types/include/CGAL/Quotient.h b/Number_types/include/CGAL/Quotient.h index 5c91f07d2cf..38e5f834768 100644 --- a/Number_types/include/CGAL/Quotient.h +++ b/Number_types/include/CGAL/Quotient.h @@ -142,7 +142,7 @@ class Quotient } #ifdef CGAL_ROOT_OF_2_ENABLE_HISTOGRAM_OF_NUMBER_OF_DIGIT_ON_THE_COMPLEX_CONSTRUCTOR - int tam() const { return std::max(num.tam(), den.tam()); } + int tam() const { return (std::max)(num.tam(), den.tam()); } #endif public: diff --git a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/fitness_function.h b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/fitness_function.h index baee94baa5a..6d53f4308f3 100644 --- a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/fitness_function.h +++ b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/fitness_function.h @@ -39,7 +39,7 @@ compute_fitness(const typename Traits::Matrix& R, // rotation matrix CGAL_assertion(points.size() >= 3); FT xmin, ymin, zmin, xmax, ymax, zmax; - xmin = ymin = zmin = FT{std::numeric_limits::max()}; + xmin = ymin = zmin = FT{(std::numeric_limits::max)()}; xmax = ymax = zmax = FT{std::numeric_limits::lowest()}; for(const Point& pt : points) @@ -81,7 +81,7 @@ compute_fitness_if_smaller(const typename Traits::Matrix& R, // rotation matrix CGAL_assertion(points.size() >= 3); FT xmin, ymin, zmin, xmax, ymax, zmax; - xmin = ymin = zmin = FT{std::numeric_limits::max()}; + xmin = ymin = zmin = FT{(std::numeric_limits::max)()}; xmax = ymax = zmax = FT{std::numeric_limits::lowest()}; // compute every 1%, with a minimum of 1000 iterations diff --git a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/optimize_2.h b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/optimize_2.h index e1208d22461..7bd6b4be3e6 100644 --- a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/optimize_2.h +++ b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/optimize_2.h @@ -123,7 +123,7 @@ void optimize_along_OBB_axes(typename Traits::Matrix& rot, rotated_points.reserve(points.size()); FT xmin, ymin, zmin, xmax, ymax, zmax; - xmin = ymin = zmin = FT{std::numeric_limits::max()}; + xmin = ymin = zmin = FT{(std::numeric_limits::max)()}; xmax = ymax = zmax = FT{std::numeric_limits::lowest()}; for(const Point& pt : points) diff --git a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/population.h b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/population.h index 47058f68712..b43430889b7 100644 --- a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/population.h +++ b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/population.h @@ -121,7 +121,7 @@ public: Vertex& get_best_vertex() { std::size_t simplex_id = static_cast(-1), vertex_id = static_cast(-1); - FT best_fitness = FT{std::numeric_limits::max()}; + FT best_fitness = FT{(std::numeric_limits::max)()}; for(std::size_t i=0, ps=m_simplices.size(); i::value) - ok = CGAL::abs(d1 - d2) < std::max(epsilon * d1, epsilon); + ok = CGAL::abs(d1 - d2) < (std::max)(epsilon * d1, epsilon); else ok = (d1 == d2); diff --git a/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h b/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h index 42970bfa8e9..909b38c0675 100644 --- a/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h @@ -129,10 +129,10 @@ protected: for(int j = 0; j < covering_sheets[1]; j++){ Kernel::Vector_2 shift(i * (orig_domain.xmax() - orig_domain.xmin()), j * orig_domain.ymax() - orig_domain.ymin()); - Kernel::Point_2 p1(orig_domain.min()); + Kernel::Point_2 p1((orig_domain.min)()); Kernel::Point_2 p2(orig_domain.xmin(), orig_domain.ymax()); Kernel::Point_2 p3(orig_domain.xmax(), orig_domain.ymin()); - Kernel::Point_2 p4(orig_domain.max()); + Kernel::Point_2 p4((orig_domain.max)()); add_segment(p1 + shift, p2 + shift, CGAL::Color(96, 104, 252)); add_segment(p1 + shift, p3 + shift, CGAL::Color(96, 104, 252)); diff --git a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/IO/File_medit.h b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/IO/File_medit.h index 3900a07a3af..7c07c643eda 100644 --- a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/IO/File_medit.h +++ b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/IO/File_medit.h @@ -43,9 +43,9 @@ canonicalize_triangle(const typename Triangulation::Periodic_triangle& pt) Offset o0 = pt[0].second; Offset o1 = pt[1].second; Offset o2 = pt[2].second; - int diffx = std::min(o0.x(), std::min(o1.x(), o2.x())); - int diffy = std::min(o0.y(), std::min(o1.y(), o2.y())); - int diffz = std::min(o0.z(), std::min(o1.z(), o2.z())); + int diffx = (std::min)(o0.x(), (std::min)(o1.x(), o2.x())); + int diffy = (std::min)(o0.y(), (std::min)(o1.y(), o2.y())); + int diffz = (std::min)(o0.z(), (std::min)(o1.z(), o2.z())); Offset diff_off(diffx, diffy, diffz); return CGAL::make_array(std::make_pair(pt[0].first, o0 - diff_off), @@ -64,9 +64,9 @@ canonicalize_tetrahedron(const typename Triangulation::Periodic_tetrahedron& pt) Offset o2 = pt[2].second; Offset o3 = pt[3].second; - int diffx = std::min(std::min(o0.x(), o1.x()), std::min(o2.x(), o3.x())); - int diffy = std::min(std::min(o0.y(), o1.y()), std::min(o2.y(), o3.y())); - int diffz = std::min(std::min(o0.z(), o1.z()), std::min(o2.z(), o3.z())); + int diffx = (std::min)((std::min)(o0.x(), o1.x()), (std::min)(o2.x(), o3.x())); + int diffy = (std::min)((std::min)(o0.y(), o1.y()), (std::min)(o2.y(), o3.y())); + int diffz = (std::min)((std::min)(o0.z(), o1.z()), (std::min)(o2.z(), o3.z())); Offset diff_off(diffx, diffy, diffz); return CGAL::make_array(std::make_pair(pt[0].first, o0 - diff_off), diff --git a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp index e7ff3beeacb..812fde428ba 100644 --- a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp +++ b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp @@ -184,18 +184,18 @@ struct Segments_function Segments_function() : segments(), nb_evals(0) { - const FT min = 1, max = 3; - const FT mid = 0.5 * (min + max); + const FT vmin = 1, vmax = 3; + const FT mid = 0.5 * (vmin + vmax); const Point pmid(mid, mid, mid); - segments.push_back(Segment(Point(min, mid, min), pmid)); - segments.push_back(Segment(Point(max, mid, min), pmid)); - segments.push_back(Segment(Point(min, mid, max), pmid)); - segments.push_back(Segment(Point(max, mid, max), pmid)); - segments.push_back(Segment(Point(mid, min, min), pmid)); - segments.push_back(Segment(Point(mid, max, min), pmid)); - segments.push_back(Segment(Point(mid, min, max), pmid)); - segments.push_back(Segment(Point(mid, max, max), pmid)); + segments.push_back(Segment(Point(vmin, mid, vmin), pmid)); + segments.push_back(Segment(Point(vmax, mid, vmin), pmid)); + segments.push_back(Segment(Point(vmin, mid, vmax), pmid)); + segments.push_back(Segment(Point(vmax, mid, vmax), pmid)); + segments.push_back(Segment(Point(mid, vmin, vmin), pmid)); + segments.push_back(Segment(Point(mid, vmax, vmin), pmid)); + segments.push_back(Segment(Point(mid, vmin, vmax), pmid)); + segments.push_back(Segment(Point(mid, vmax, vmax), pmid)); } FT operator()(const Point& p) @@ -204,7 +204,7 @@ struct Segments_function FT min_distance = 1000000; for (Segments::const_iterator si = segments.begin(); si != segments.end(); ++si) - min_distance = std::min(CGAL::squared_distance(p, *si), min_distance); + min_distance = (std::min)(CGAL::squared_distance(p, *si), min_distance); return min_distance - 0.01; // Change the squared beam radius here } diff --git a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_periodic_3_static_filters.h b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_periodic_3_static_filters.h index f2e86a52bb6..777e1a8b4c1 100644 --- a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_periodic_3_static_filters.h +++ b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_periodic_3_static_filters.h @@ -61,17 +61,17 @@ Point my_rand_p3() } // Random int in [0;256). -int my_rand_int(int min, int max) +int my_rand_int(int imin, int imax) { - return r->get_int(min, max+1); + return r->get_int(imin, imax+1); } // Random offset -Offset my_rand_o3(int min, int max) +Offset my_rand_o3(int imin, int imax) { - int x = my_rand_int(min,max); - int y = my_rand_int(min,max); - int z = my_rand_int(min,max); + int x = my_rand_int(imin,imax); + int y = my_rand_int(imin,imax); + int z = my_rand_int(imin,imax); return Offset(x, y, z); } diff --git a/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/P4HDT2.cpp b/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/P4HDT2.cpp index ffaf11c3eff..9df877ad6e0 100644 --- a/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/P4HDT2.cpp +++ b/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/P4HDT2.cpp @@ -351,7 +351,7 @@ MainWindow::on_actionInsertRandomPoints_triggered() tr("Enter number of random points"), 100, 0, - std::numeric_limits::max(), + (std::numeric_limits::max)(), 1, &ok); diff --git a/Periodic_4_hyperbolic_triangulation_2/include/CGAL/Periodic_4_hyperbolic_triangulation_2.h b/Periodic_4_hyperbolic_triangulation_2/include/CGAL/Periodic_4_hyperbolic_triangulation_2.h index cb76b7b56a7..a6e6d7aceeb 100644 --- a/Periodic_4_hyperbolic_triangulation_2/include/CGAL/Periodic_4_hyperbolic_triangulation_2.h +++ b/Periodic_4_hyperbolic_triangulation_2/include/CGAL/Periodic_4_hyperbolic_triangulation_2.h @@ -608,15 +608,15 @@ protected: } // Now we know that all vertices lie in different regions. - Hyperbolic_translation min(7, 2, 5); + Hyperbolic_translation vmin(7, 2, 5); Hyperbolic_translation trans; for(int i=0; i<3; ++i) { int j = (i + 1) % 3; // the index of the 'next' vertex Hyperbolic_translation tmp = fh->translation(i).inverse() * fh->translation(j); - if(tmp < min) + if(tmp < vmin) { - min = tmp; + vmin = tmp; trans = fh->translation(i).inverse(); } } diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/AABB_traversal_traits_with_transformation.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/AABB_traversal_traits_with_transformation.h index 9e9f488824d..65b6f0233fa 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/AABB_traversal_traits_with_transformation.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/AABB_traversal_traits_with_transformation.h @@ -51,9 +51,9 @@ class Traversal_traits_with_transformation_helper AK::Aff_transformation_3 a_at = c2f(at); - AK::FT xtrm[6] = { c2f(bbox.min(0)), c2f(bbox.max(0)), - c2f(bbox.min(1)), c2f(bbox.max(1)), - c2f(bbox.min(2)), c2f(bbox.max(2)) }; + AK::FT xtrm[6] = { c2f((bbox.min)(0)), c2f((bbox.max)(0)), + c2f((bbox.min)(1)), c2f((bbox.max)(1)), + c2f((bbox.min)(2)), c2f((bbox.max)(2)) }; typename AK::Point_3 ps[8]; ps[0] = a_at( AK::Point_3(xtrm[0], xtrm[2], xtrm[4]) ); @@ -83,9 +83,9 @@ class Traversal_traits_with_transformation_helper AK::Aff_transformation_3 a_at = c2f(at); - AK::FT xtrm[6] = { c2f(bbox.min(0)), c2f(bbox.max(0)), - c2f(bbox.min(1)), c2f(bbox.max(1)), - c2f(bbox.min(2)), c2f(bbox.max(2)) }; + AK::FT xtrm[6] = { c2f((bbox.min)(0)), c2f((bbox.max)(0)), + c2f((bbox.min)(1)), c2f((bbox.max)(1)), + c2f((bbox.min)(2)), c2f((bbox.max)(2)) }; typename AK::Point_3 ps[2]; ps[0] = a_at( AK::Point_3(xtrm[0], xtrm[2], xtrm[4]) ); diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h index 393281d3da6..edd6f9349e4 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h @@ -1216,7 +1216,7 @@ std::size_t snap_borders(TriangleMesh& tm_A, border_halfedges(tm_A, std::back_inserter(border_vertices_A)); border_halfedges(tm_B, std::back_inserter(border_vertices_B)); - const FT tol_mx(std::numeric_limits::max()); + const FT tol_mx((std::numeric_limits::max)()); Tolerance_map tolerance_map_A = get(Vertex_property_tag(), tm_A); internal::assign_tolerance_with_local_edge_length_bound(border_vertices_A, tolerance_map_A, tol_mx, tm_A, np_A); Tolerance_map tolerance_map_B = get(Vertex_property_tag(), tm_B); @@ -1296,7 +1296,7 @@ std::size_t snap_borders(TriangleMesh& tm, std::vector border_vertices; border_halfedges(tm, std::back_inserter(border_vertices)); - const FT tol_mx(std::numeric_limits::max()); + const FT tol_mx((std::numeric_limits::max)()); Tolerance_map tolerance_map = get(Vertex_property_tag(), tm); internal::assign_tolerance_with_local_edge_length_bound(border_vertices, tolerance_map, tol_mx, tm, np); diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap_vertices.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap_vertices.h index d97175835b7..7bdad28de3f 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap_vertices.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap_vertices.h @@ -868,7 +868,7 @@ std::size_t snap_vertices(const HalfedgeRange_A& halfedge_range_A, typedef CGAL::dynamic_vertex_property_t Vertex_property_tag; typedef typename boost::property_map::type Tolerance_map; - const FT max_tol(std::numeric_limits::max()); + const FT max_tol((std::numeric_limits::max)()); Tolerance_map tolerance_map_A = get(Vertex_property_tag(), tm_A); internal::assign_tolerance_with_local_edge_length_bound(halfedge_range_A, tolerance_map_A, max_tol, tm_A, np_A); diff --git a/Polygonal_surface_reconstruction/include/CGAL/internal/hypothesis.h b/Polygonal_surface_reconstruction/include/CGAL/internal/hypothesis.h index 7ffe0f5b6ee..af6a1cac0e5 100644 --- a/Polygonal_surface_reconstruction/include/CGAL/internal/hypothesis.h +++ b/Polygonal_surface_reconstruction/include/CGAL/internal/hypothesis.h @@ -374,12 +374,12 @@ namespace CGAL { Planar_segment* s = segments[i]; const Plane* plane = s->fit_supporting_plane(); // user may provide invalid plane fitting (we always fit) - FT max_dist = -std::numeric_limits::max(); + FT max_dist = -(std::numeric_limits::max)(); for (std::size_t j = 0; j < s->size(); ++j) { std::size_t idx = s->at(j); const Point& p = points[idx]; FT sdist = CGAL::squared_distance(*plane, p); - max_dist = std::max(max_dist, std::sqrt(sdist)); + max_dist = (std::max)(max_dist, std::sqrt(sdist)); } avg_max_dist += max_dist; diff --git a/Polyhedron/demo/Polyhedron/CGAL_double_edit.cpp b/Polyhedron/demo/Polyhedron/CGAL_double_edit.cpp index 50b969ed1bc..a50aef4180b 100644 --- a/Polyhedron/demo/Polyhedron/CGAL_double_edit.cpp +++ b/Polyhedron/demo/Polyhedron/CGAL_double_edit.cpp @@ -57,9 +57,9 @@ public: this->validator->setTop(d); } - void DoubleEdit::setRange(double min, double max) + void DoubleEdit::setRange(double rmin, double rmax) { - this->validator->setRange(min, max, this->validator->decimals()); + this->validator->setRange(rmin, rmax, this->validator->decimals()); } double DoubleEdit::getValue() diff --git a/Polyhedron/demo/Polyhedron/CGAL_double_edit.h b/Polyhedron/demo/Polyhedron/CGAL_double_edit.h index 1b542d2bb22..a5a43c61a30 100644 --- a/Polyhedron/demo/Polyhedron/CGAL_double_edit.h +++ b/Polyhedron/demo/Polyhedron/CGAL_double_edit.h @@ -23,7 +23,7 @@ public: void setValue(double d); void setMinimum(double d); void setMaximum(double d); - void setRange(double min, double max); + void setRange(double rmin, double rmax); double getValue(); double getMinimum(); double getMaximum(); diff --git a/Polyhedron/demo/Polyhedron/MainWindow.cpp b/Polyhedron/demo/Polyhedron/MainWindow.cpp index c1491863fd1..bd370cd7827 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow.cpp +++ b/Polyhedron/demo/Polyhedron/MainWindow.cpp @@ -1006,7 +1006,7 @@ void MainWindow::updateViewersBboxes(bool recenter) } -void MainWindow::computeViewerBBox(CGAL::qglviewer::Vec& min, CGAL::qglviewer::Vec& max) +void MainWindow::computeViewerBBox(CGAL::qglviewer::Vec& vmin, CGAL::qglviewer::Vec& vmax) { const Scene::Bbox bbox = scene->bbox(); const double xmin = bbox.xmin(); @@ -1018,8 +1018,8 @@ void MainWindow::computeViewerBBox(CGAL::qglviewer::Vec& min, CGAL::qglviewer::V - min = CGAL::qglviewer::Vec(xmin, ymin, zmin); - max= CGAL::qglviewer::Vec(xmax, ymax, zmax); + vmin = CGAL::qglviewer::Vec(xmin, ymin, zmin); + vmax= CGAL::qglviewer::Vec(xmax, ymax, zmax); CGAL::qglviewer::Vec bbox_center((xmin+xmax)/2, (ymin+ymax)/2, (zmin+zmax)/2); diff --git a/Polyhedron/demo/Polyhedron/MainWindow.h b/Polyhedron/demo/Polyhedron/MainWindow.h index 3f3cb44b8a7..4e544c08378 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow.h +++ b/Polyhedron/demo/Polyhedron/MainWindow.h @@ -95,7 +95,7 @@ public: CGAL::Three::Polyhedron_demo_io_plugin_interface*, bool& ok, bool add_to_scene=true); - void computeViewerBBox(CGAL::qglviewer::Vec &min, CGAL::qglviewer::Vec &max); + void computeViewerBBox(CGAL::qglviewer::Vec &vmin, CGAL::qglviewer::Vec &vmax); void updateViewerBbox(Viewer* vi, bool recenter, CGAL::qglviewer::Vec min, CGAL::qglviewer::Vec max); Q_SIGNALS: diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Cluster_classification.cpp b/Polyhedron/demo/Polyhedron/Plugins/Classification/Cluster_classification.cpp index 82aa38732c7..ee43207e134 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Classification/Cluster_classification.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Classification/Cluster_classification.cpp @@ -527,7 +527,7 @@ void Cluster_classification::change_color (int index, float* vmin, float* vmax) int cid = m_cluster_id[*it]; if (cid != -1) { - float v = std::max (0.f, std::min(1.f, m_label_probabilities[corrected_index][cid])); + float v = std::max (0.f, (std::min)(1.f, m_label_probabilities[corrected_index][cid])); m_points->point_set()->set_color(*it, ramp.r(v) * 255, ramp.g(v) * 255, ramp.b(v) * 255); } else @@ -546,8 +546,8 @@ void Cluster_classification::change_color (int index, float* vmin, float* vmax) Feature_handle feature = m_features[corrected_index]; - float min = std::numeric_limits::max(); - float max = -std::numeric_limits::max(); + float min = (std::numeric_limits::max)(); + float max = -(std::numeric_limits::max)(); if (vmin != NULL && vmax != NULL && *vmin != std::numeric_limits::infinity() diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp b/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp index 1f92b21b7e3..bdca3ace2e5 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp @@ -429,7 +429,7 @@ void Point_set_item_classification::change_color (int index, float* vmin, float* for (Point_set::const_iterator it = m_points->point_set()->begin(); it != m_points->point_set()->first_selected(); ++ it) { - float v = std::max (0.f, std::min(1.f, m_label_probabilities[corrected_index][*it])); + float v = std::max (0.f, (std::min)(1.f, m_label_probabilities[corrected_index][*it])); m_points->point_set()->set_color(*it, ramp.r(v) * 255, ramp.g(v) * 255, ramp.b(v) * 255); } } @@ -444,8 +444,8 @@ void Point_set_item_classification::change_color (int index, float* vmin, float* } Feature_handle feature = m_features[corrected_index]; - float min = std::numeric_limits::max(); - float max = -std::numeric_limits::max(); + float min = (std::numeric_limits::max)(); + float max = -(std::numeric_limits::max)(); if (vmin != NULL && vmax != NULL && *vmin != std::numeric_limits::infinity() diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.h b/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.h index 075c9b812fb..ac8a956818a 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.h +++ b/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.h @@ -118,8 +118,8 @@ class Point_set_item_classification : public Item_classification_base for (std::size_t i = 0; i < m_features.size(); ++ i) { - float vmin = std::numeric_limits::max(); - float vmax = -std::numeric_limits::max(); + float vmin = (std::numeric_limits::max)(); + float vmax = -(std::numeric_limits::max)(); float vmean = 0.f; std::size_t nb = 0; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Surface_mesh_item_classification.cpp b/Polyhedron/demo/Polyhedron/Plugins/Classification/Surface_mesh_item_classification.cpp index f2f8f4f2c32..5f567487cff 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Classification/Surface_mesh_item_classification.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Classification/Surface_mesh_item_classification.cpp @@ -151,7 +151,7 @@ void Surface_mesh_item_classification::change_color (int index, float* vmin, flo { for(face_descriptor fd : faces(*(m_mesh->polyhedron()))) { - float v = std::max (0.f, std::min(1.f, m_label_probabilities[corrected_index][fd])); + float v = std::max (0.f, (std::min)(1.f, m_label_probabilities[corrected_index][fd])); m_color[fd] = CGAL::Color((unsigned char)(ramp.r(v) * 255), (unsigned char)(ramp.g(v) * 255), (unsigned char)(ramp.b(v) * 255)); @@ -169,8 +169,8 @@ void Surface_mesh_item_classification::change_color (int index, float* vmin, flo Feature_handle feature = m_features[corrected_index]; - float min = std::numeric_limits::max(); - float max = -std::numeric_limits::max(); + float min = (std::numeric_limits::max)(); + float max = -(std::numeric_limits::max)(); if (vmin != NULL && vmax != NULL && *vmin != std::numeric_limits::infinity() diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Create_bbox_mesh_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Create_bbox_mesh_plugin.cpp index 57b23a66f33..13bf84315e3 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Create_bbox_mesh_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Create_bbox_mesh_plugin.cpp @@ -116,9 +116,9 @@ bool Create_bbox_mesh_plugin::bbox(bool extended) bbox.zmax() + delta_z); } - if(bbox.min(0) > bbox.max(0) || - bbox.min(1) > bbox.max(1) || - bbox.min(2) > bbox.max(2)) + if((bbox.min)(0) > (bbox.max)(0) || + (bbox.min)(1) > (bbox.max)(1) || + (bbox.min)(2) > (bbox.max)(2)) { return false; } diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.cpp index c81ee8e029e..cada4c95506 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.cpp @@ -392,16 +392,16 @@ void Scene_edit_box_item::compute_bbox() const const CGAL::qglviewer::Vec offset = static_cast(CGAL::QGLViewer::QGLViewerPool().first())->offset(); - QVector3D min(d->pool[0], d->pool[1], d->pool[2]); - QVector3D max(d->pool[3], d->pool[4], d->pool[5]); + QVector3D vmin(d->pool[0], d->pool[1], d->pool[2]); + QVector3D vmax(d->pool[3], d->pool[4], d->pool[5]); for(int i=0; i< 3; ++i) { - min[i] += d->frame->translation()[i]-d->center_[i]-offset[i]; - max[i] += d->frame->translation()[i]-d->center_[i]-offset[i]; + vmin[i] += d->frame->translation()[i]-d->center_[i]-offset[i]; + vmax[i] += d->frame->translation()[i]-d->center_[i]-offset[i]; } - setBbox(Scene_item::Bbox(min.x(),min.y(),min.z(),max.x(),max.y(),max.z())); + setBbox(Scene_item::Bbox(vmin.x(),vmin.y(),vmin.z(),vmax.x(),vmax.y(),vmax.z())); } diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp index f8b9817b0fc..dc8eff3084c 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp @@ -490,10 +490,10 @@ public Q_SLOTS: } std::cout << "Parameterized with ARAP (SM) computed." << std::endl; - xmin = std::numeric_limits::max(); - xmax = std::numeric_limits::min(); - ymin = std::numeric_limits::max(); - ymax = std::numeric_limits::min(); + xmin = (std::numeric_limits::max)(); + xmax = (std::numeric_limits::min)(); + ymin = (std::numeric_limits::max)(); + ymax = (std::numeric_limits::min)(); uv_map_3 = sm->add_property_map("v:uv3").first; for(SMesh::Vertex_index v : sm->vertices()) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_segmentation_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_segmentation_plugin.cpp index b00e6ee000c..f4c70653e01 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_segmentation_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_segmentation_plugin.cpp @@ -307,7 +307,7 @@ void Polyhedron_demo_mesh_segmentation_plugin::apply_Partition_button_clicked(Fa faces(*pair->first->face_graph())) { if(sdf_pmap[f] != -1 - && sdf_pmap[f] != std::numeric_limits::max()) + && sdf_pmap[f] != (std::numeric_limits::max)()) { has_sdf_values = true; break; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_simplification_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_simplification_plugin.cpp index 0847c806af8..0049f4c8383 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_simplification_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_simplification_plugin.cpp @@ -149,7 +149,7 @@ void Polyhedron_demo_mesh_simplification_plugin::on_actionSimplify_triggered() : 0), (ui.m_use_edge_length->isChecked() ? ui.m_edge_length->value() - : std::numeric_limits::max())); + : (std::numeric_limits::max)())); if (selection_item) { diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Offset_meshing_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Offset_meshing_plugin.cpp index 827cdaff258..45f6c3afa8a 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Offset_meshing_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Offset_meshing_plugin.cpp @@ -436,9 +436,9 @@ void Polyhedron_demo_offset_meshing_plugin::offset_meshing() } else if(soup_item == 0) return; - double X=box.max(0)-box.min(0), - Y = box.max(1)-box.min(1), - Z = box.max(2)-box.min(2); + double X=(box.max)(0)-(box.min)(0), + Y = (box.max)(1)-(box.min)(1), + Z = (box.max)(2)-(box.min)(2); diag = CGAL::sqrt(X*X+Y*Y+Z*Z); double offset_value = QInputDialog::getDouble(mw, QString("Choose Offset Value"), diff --git a/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp b/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp index 85d79582dd3..01c192db153 100644 --- a/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp @@ -393,10 +393,10 @@ struct Scene_c3t3_item_priv { void invalidate_stats() { - min_edges_length = std::numeric_limits::max(); + min_edges_length = (std::numeric_limits::max)(); max_edges_length = 0; mean_edges_length = 0; - min_dihedral_angle = std::numeric_limits::max(); + min_dihedral_angle = (std::numeric_limits::max)(); max_dihedral_angle = 0; mean_dihedral_angle = 0; nb_subdomains = 0; @@ -404,8 +404,8 @@ struct Scene_c3t3_item_priv { nb_cnc = 0; nb_vertices = 0; nb_tets = 0; - smallest_radius_radius = std::numeric_limits::max(); - smallest_edge_radius = std::numeric_limits::max(); + smallest_radius_radius = (std::numeric_limits::max)(); + smallest_edge_radius = (std::numeric_limits::max)(); biggest_v_sma_cube = 0; computed_stats = false; } diff --git a/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp index b6c191bfd18..5338aa8ccd4 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp @@ -39,7 +39,7 @@ struct Scene_polylines_item_private { { nb_vertices = 0; nb_edges = 0; - min_length = std::numeric_limits::max(); + min_length = (std::numeric_limits::max)(); max_length = 0; mean_length = 0; computed_stats = false; diff --git a/Polynomial/include/CGAL/Polynomial/bezout_matrix.h b/Polynomial/include/CGAL/Polynomial/bezout_matrix.h index a4e06d7145b..3b8f3447ec0 100644 --- a/Polynomial/include/CGAL/Polynomial/bezout_matrix.h +++ b/Polynomial/include/CGAL/Polynomial/bezout_matrix.h @@ -109,8 +109,8 @@ hybrid_bezout_matrix(typename Polynomial_traits_d::Polynomial_d f, B[i-sub-1][j-1] = s; } } - for (i = std::max(m+1, 1+sub); i <= n; i++) { - for (j = i-m; j <= std::min(i, n-sub); j++) { + for (i = (std::max)(m+1, 1+sub); i <= n; i++) { + for (j = i-m; j <= (std::min)(i, n-sub); j++) { B[i-sub-1][j-1] = coeff(g,i-j); } } diff --git a/Shape_detection/test/Shape_detection/include/test_efficient_RANSAC_generators.h b/Shape_detection/test/Shape_detection/include/test_efficient_RANSAC_generators.h index 3cb8d771b5d..fc9d7c9cd99 100644 --- a/Shape_detection/test/Shape_detection/include/test_efficient_RANSAC_generators.h +++ b/Shape_detection/test/Shape_detection/include/test_efficient_RANSAC_generators.h @@ -22,8 +22,8 @@ #include template -fl_t random_float(fl_t min, fl_t max) { - return fl_t(CGAL::get_default_random().get_double(min, max)); +fl_t random_float(fl_t fmin, fl_t fmax) { + return fl_t(CGAL::get_default_random().get_double(fmin, fmax)); } template diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/test.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/test.h index e7d6f9e43d7..c8e7479aad5 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/test.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/test.h @@ -137,8 +137,8 @@ inline bool is_time_clearly_not_within_possibly_inexact_bisector_time_interval( { FT lSrcT = aBisector->opposite()->vertex()->time() ; FT lTgtT = aBisector->vertex()->time() ; - FT lLoT = std::min(lSrcT,lTgtT); - FT lHiT = std::max(lSrcT,lTgtT); + FT lLoT = (std::min)(lSrcT,lTgtT); + FT lHiT = (std::max)(lSrcT,lTgtT); return ( aT < lLoT || aT > lHiT ) && is_possibly_inexact_time_clearly_not_equal_to(aT,lLoT) @@ -150,8 +150,8 @@ inline bool is_time_clearly_within_possibly_inexact_bisector_time_interval( FT c { FT lSrcT = aBisector->opposite()->vertex()->time() ; FT lTgtT = aBisector->vertex()->time() ; - FT lLoT = std::min(lSrcT,lTgtT); - FT lHiT = std::max(lSrcT,lTgtT); + FT lLoT = (std::min)(lSrcT,lTgtT); + FT lHiT = (std::max)(lSrcT,lTgtT); return ( lLoT < aT && aT < lHiT ) && is_possibly_inexact_time_clearly_not_equal_to(aT,lLoT) diff --git a/Stream_support/test/Stream_support/test_read_WKT.cpp b/Stream_support/test/Stream_support/test_read_WKT.cpp index e1324a0abe5..94bcc1f9234 100644 --- a/Stream_support/test/Stream_support/test_read_WKT.cpp +++ b/Stream_support/test/Stream_support/test_read_WKT.cpp @@ -18,10 +18,10 @@ int main() { typedef CGAL::Point_2 Point; typedef std::vector Linestring; - typedef CGAL::Polygon_with_holes_2 Polygon; + typedef CGAL::Polygon_with_holes_2 Cgal_polygon; typedef std::vector MultiPoint; typedef std::vector MultiLinestring; - typedef std::vector MultiPolygon; + typedef std::vector MultiPolygon; Point p; { @@ -38,7 +38,7 @@ int main() CGAL_assertion(ls.size() == 3); } { - Polygon poly; + Cgal_polygon poly; std::ifstream in("data/polygon.wkt"); CGAL::read_polygon_WKT(in, poly); in.close(); diff --git a/Stream_support/test/Stream_support/test_write_WKT.cpp b/Stream_support/test/Stream_support/test_write_WKT.cpp index 5fdfb77557c..abe5b34f098 100644 --- a/Stream_support/test/Stream_support/test_write_WKT.cpp +++ b/Stream_support/test/Stream_support/test_write_WKT.cpp @@ -16,10 +16,10 @@ typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef CGAL::Point_2 Point; typedef std::vector Linestring; -typedef CGAL::Polygon_with_holes_2 Polygon; +typedef CGAL::Polygon_with_holes_2 Cgal_polygon; typedef std::vector MultiPoint; typedef std::vector MultiLinestring; -typedef std::vector MultiPolygon; +typedef std::vector MultiPolygon; double fRand(double fMin, double fMax) { @@ -42,7 +42,7 @@ Linestring generate_linestring() ls.push_back(generate_point(0,15,0,15)); return ls; } -Polygon generate_polygon() +Cgal_polygon generate_polygon() { Point bl,br, t; bl = generate_point(-10,-5, -10, -5); @@ -56,22 +56,22 @@ Polygon generate_polygon() xt(t.x()), ymin(bl.y()), ymid((ymax+ymin)/4.0); - Polygon::Polygon_2 border; + Cgal_polygon::Polygon_2 border; border.push_back(bl); border.push_back(t); border.push_back(br); - Polygon::Polygon_2 hole1; + Cgal_polygon::Polygon_2 hole1; hole1.push_back(Point((xt+xmax)/2, (ymin+ymid)/2)); hole1.push_back(Point(((xt+xmax)/2), ymid)); hole1.push_back(Point(xt+(xmax-xt)/4, (ymin+ymid)/2)); - Polygon::Polygon_2 hole2; + Cgal_polygon::Polygon_2 hole2; hole2.push_back(Point((xt+xmin)/2, (ymin+ymid)/2)); hole2.push_back(Point(((xt+xmin)/2), ymid)); hole2.push_back(Point(xmin+(xt-xmin)/4, (ymin+ymid)/2)); - Polygon::Holes_container holes; + Cgal_polygon::Holes_container holes; holes.push_back(hole1); holes.push_back(hole2); - return Polygon(border, holes.begin(), holes.end()); + return Cgal_polygon(border, holes.begin(), holes.end()); } MultiPoint generate_multipoint() { @@ -91,7 +91,7 @@ MultiLinestring generate_multilinestring() } MultiPolygon generate_multipolygon() { - Polygon p1=generate_polygon(), + Cgal_polygon p1=generate_polygon(), p2=generate_polygon(); MultiPolygon polies; polies.push_back(p1); @@ -134,14 +134,14 @@ int main() CGAL_assertion(ls == test_ls); - Polygon poly = generate_polygon(); + Cgal_polygon poly = generate_polygon(); { std::ofstream os("test.wkt"); os.precision(17); CGAL::write_polygon_WKT(os, poly); os.close(); } - Polygon test_poly; + Cgal_polygon test_poly; { std::ifstream is("test.wkt"); CGAL::read_polygon_WKT(is, test_poly); diff --git a/Surface_mesh/include/CGAL/Surface_mesh/Properties.h b/Surface_mesh/include/CGAL/Surface_mesh/Properties.h index a0eca2dadae..756562762cb 100644 --- a/Surface_mesh/include/CGAL/Surface_mesh/Properties.h +++ b/Surface_mesh/include/CGAL/Surface_mesh/Properties.h @@ -440,7 +440,7 @@ public: { for (std::size_t i=0; ireserve(n); - capacity_ = std::max(n, capacity_); + capacity_ = (std::max)(n, capacity_); } // resize all arrays to size n @@ -465,7 +465,7 @@ public: for (std::size_t i=0; ipush_back(); ++size_; - capacity_ = (std::max(size_, capacity_)); + capacity_ = ((std::max)(size_, capacity_)); } // reset element to its default property values diff --git a/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h b/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h index 06d83272afd..ee26c4bfa7a 100644 --- a/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h +++ b/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h @@ -64,17 +64,17 @@ namespace CGAL { typedef boost::uint32_t size_type; /// Constructor. %Default construction creates an invalid index. /// We write -1, which is - /// std::numeric_limits::max() + /// (std::numeric_limits::max)() /// as `size_type` is an unsigned type. explicit SM_Index(size_type _idx=(std::numeric_limits::max)()) : idx_(_idx) {} /// Get the underlying index of this index operator size_type() const { return idx_; } - /// reset index to be invalid (index=std::numeric_limits::max()) + /// reset index to be invalid (index=(std::numeric_limits::max)()) void reset() { idx_=(std::numeric_limits::max)(); } - /// return whether the index is valid, i.e., the index is not equal to `%std::numeric_limits::max()`. + /// return whether the index is valid, i.e., the index is not equal to `%(std::numeric_limits::max)()`. bool is_valid() const { size_type inf = (std::numeric_limits::max)(); return idx_ != inf; @@ -253,10 +253,10 @@ namespace CGAL { // compatibility with OpenMesh handles size_type idx() const { return (size_type)halfedge_ / 2; } - // resets index to be invalid (index=std::numeric_limits::max()) + // resets index to be invalid (index=(std::numeric_limits::max)()) void reset() { halfedge_.reset(); } - // returns whether the index is valid, i.e., the index is not equal to std::numeric_limits::max(). + // returns whether the index is valid, i.e., the index is not equal to (std::numeric_limits::max)(). bool is_valid() const { return halfedge_.is_valid(); } diff --git a/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h b/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h index 1547b8b7625..bd229b3fa06 100644 --- a/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h +++ b/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h @@ -54,7 +54,7 @@ #include #endif -#define CGAL_VSA_INVALID_TAG std::numeric_limits::max() +#define CGAL_VSA_INVALID_TAG (std::numeric_limits::max)() namespace CGAL { diff --git a/Surface_mesh_shortest_path/benchmark/Surface_mesh_shortest_path/benchmark_shortest_paths.cpp b/Surface_mesh_shortest_path/benchmark/Surface_mesh_shortest_path/benchmark_shortest_paths.cpp index 00465148257..412d7ed844f 100644 --- a/Surface_mesh_shortest_path/benchmark/Surface_mesh_shortest_path/benchmark_shortest_paths.cpp +++ b/Surface_mesh_shortest_path/benchmark/Surface_mesh_shortest_path/benchmark_shortest_paths.cpp @@ -99,8 +99,8 @@ public: } else { - m_minimum = std::min(m_minimum, sample); - m_maximum = std::max(m_maximum, sample); + m_minimum = (std::min)(m_minimum, sample); + m_maximum = (std::max)(m_maximum, sample); } m_sum += sample; ++m_numSamples; @@ -227,7 +227,7 @@ void run_benchmarks(CGAL::Random& rand, size_t numTrials, size_t numSources, siz outData.constructionTime.add_sample(elapsed.wall); #if !defined(NDEBUG) - outData.peakMemoryUsage.add_sample(std::max(shortestPaths.peak_memory_usage(), shortestPaths.current_memory_usage())); + outData.peakMemoryUsage.add_sample((std::max)(shortestPaths.peak_memory_usage(), shortestPaths.current_memory_usage())); #endif for (size_t j = 0; j < numQueries; ++j) @@ -333,4 +333,4 @@ int main(int argc, char* argv[]) } return EXIT_SUCCESS; -} \ No newline at end of file +} diff --git a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h index 01057be54ca..86316179c41 100644 --- a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h +++ b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h @@ -413,7 +413,7 @@ public: + (sizeof(Cone_expansion_event) + (sizeof(Cone_expansion_event*)) * m_peakQueueSize) + (sizeof(Cone_tree_node) * m_nodesAtPeakQueue); - return std::max(peakNodeUsage, peakQueueUsage); + return (std::max)(peakNodeUsage, peakQueueUsage); } /// \endcond diff --git a/Surface_mesh_topology/benchmark/Surface_mesh_topology/path_homotopy_with_schema.cpp b/Surface_mesh_topology/benchmark/Surface_mesh_topology/path_homotopy_with_schema.cpp index 446367cf332..9ae235988b1 100644 --- a/Surface_mesh_topology/benchmark/Surface_mesh_topology/path_homotopy_with_schema.cpp +++ b/Surface_mesh_topology/benchmark/Surface_mesh_topology/path_homotopy_with_schema.cpp @@ -112,18 +112,18 @@ int main(int argc, char** argv) { if (i!=0) { - random=CGAL::Random(random.get_int(0, std::numeric_limits::max())); + random=CGAL::Random(random.get_int(0, (std::numeric_limits::max)())); } std::cout<<"Random seed: "<(random.get_int - (10, std::max(std::size_t(11), + (10, (std::max)(std::size_t(11), cm.number_of_darts()/10))); } if (!withD) { D=static_cast(random.get_int - (10, std::max(std::size_t(11), + (10, (std::max)(std::size_t(11), cm.number_of_darts()/10))); } diff --git a/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy.cpp b/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy.cpp index 68367231b6d..6aa9325642b 100644 --- a/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy.cpp +++ b/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy.cpp @@ -135,7 +135,7 @@ int main(int argc, char** argv) if (i!=0) { random=CGAL::Random(static_cast - (random.get_int(0, std::numeric_limits::max()))); + (random.get_int(0, (std::numeric_limits::max)()))); } std::cout<<"Random seed: "<(get_ith_dart(i))) || (get_next_flip(i) && get_map().template is_free<2>(get_next_dart(i)))) - { return std::numeric_limits::max(); } + { return (std::numeric_limits::max)(); } return m_map.positive_turn(get_ith_real_dart(i), get_ith_real_dart(next_index(i))); @@ -1123,7 +1123,7 @@ public: if ((!get_ith_flip(i) && get_map().template is_free<2>(get_ith_dart(i))) || (!get_next_flip(i) && get_map().template is_free<2>(get_next_dart(i)))) - { return std::numeric_limits::max(); } + { return (std::numeric_limits::max)(); } return m_map.positive_turn(get_opposite_ith_real_dart(next_index(i)), get_opposite_ith_real_dart(i)); diff --git a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Minimal_quadrangulation.h b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Minimal_quadrangulation.h index 2850e7f2554..6f8f0348634 100644 --- a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Minimal_quadrangulation.h +++ b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Minimal_quadrangulation.h @@ -408,7 +408,7 @@ public: { return 0; } if (get_reduced_map().is_marked(dh1, m_mark_hole)) - { return std::numeric_limits::max(); } + { return (std::numeric_limits::max)(); } Dart_const_handle ddh1=dh1; std::size_t res=1; @@ -420,7 +420,7 @@ public: ++res; ddh1=get_reduced_map().template beta<1, 2>(ddh1); if (get_reduced_map().is_marked(ddh1, m_mark_hole)) - { return std::numeric_limits::max(); } + { return (std::numeric_limits::max)(); } CGAL_assertion(!get_reduced_map().template is_free<1>(ddh1)); CGAL_assertion(get_reduced_map().template beta<1>(ddh1)==dh2 || ddh1!=dh1); @@ -449,7 +449,7 @@ public: if (get_reduced_map().is_marked (get_reduced_map().template beta <2>(dh1), m_mark_hole)) - { return std::numeric_limits::max(); } + { return (std::numeric_limits::max)(); } dh1=get_reduced_map().template beta<2>(dh1); dh2=get_reduced_map().template beta<2>(dh2); @@ -463,7 +463,7 @@ public: ++res; ddh1=get_reduced_map().template beta<0, 2>(ddh1); if (get_reduced_map().is_marked(ddh1, m_mark_hole)) - { return std::numeric_limits::max(); } + { return (std::numeric_limits::max)(); } CGAL_assertion(!get_reduced_map().template is_free<0>(ddh1)); CGAL_assertion(get_reduced_map().template beta<0>(ddh1)==dh2 || ddh1!=dh1); @@ -1183,7 +1183,7 @@ protected: return get_reduced_map().info(dh); #endif // CGAL_PWRLE_TURN_V2 std::cerr<<"Error: impossible to get dart id without method V2 or V3."<::max(); + return (std::numeric_limits::max)(); } /// @return the positive turn given two darts using their ids (unsed for CGAL_PWRLE_TURN_V2 and V3) @@ -1204,7 +1204,7 @@ protected: get_dart_id(dh2)-get_dart_id(dh1)> static_cast(get_reduced_map().template info<0>(dh1))) // the gap is more than the degree, so we crossed a hole {// so we return an "infinite" value - return std::numeric_limits::max(); + return (std::numeric_limits::max)(); } return get_dart_id(dh2)-get_dart_id(dh1); } @@ -1227,7 +1227,7 @@ protected: get_dart_id(dh1)-get_dart_id(dh2)> static_cast(get_reduced_map().template info<0>(dh1))) // the gap is more than the degree, so we crossed a hole {// so we return an "infinite" value - return std::numeric_limits::max(); + return (std::numeric_limits::max)(); } return get_dart_id(dh1)-get_dart_id(dh2); } diff --git a/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h b/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h index 63355559b65..7a6e5f03950 100644 --- a/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h +++ b/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h @@ -110,7 +110,7 @@ public: m_current_path(m_paths->size()), m_current_dart(0), m_draw_marked_darts(true), - m_amark(amark==std::numeric_limits::max()? + m_amark(amark==(std::numeric_limits::max)()? LCC::INVALID_MARK:amark) { m_current_dart=lcc.number_of_darts(); compute_elements(); @@ -343,7 +343,7 @@ template void draw(const Mesh& alcc, const std::vector >& paths, const char* title="Mesh Viewer", - std::size_t amark=std::numeric_limits::max(), + std::size_t amark=(std::numeric_limits::max)(), bool nofill=false, const DrawingFunctor& drawing_functor=DrawingFunctor()) { @@ -371,7 +371,7 @@ template void draw(const Mesh& alcc, const std::vector >& paths, const char* title="LCC Viewer", - std::size_t amark=std::numeric_limits::max(), + std::size_t amark=(std::numeric_limits::max)(), bool nofill=false) { DefaultDrawingFunctorLCC f; diff --git a/Surface_mesh_topology/test/Surface_mesh_topology/path_with_rle_deformation_tests.cpp b/Surface_mesh_topology/test/Surface_mesh_topology/path_with_rle_deformation_tests.cpp index ee72cfc85f9..90a17e8f79b 100644 --- a/Surface_mesh_topology/test/Surface_mesh_topology/path_with_rle_deformation_tests.cpp +++ b/Surface_mesh_topology/test/Surface_mesh_topology/path_with_rle_deformation_tests.cpp @@ -35,7 +35,7 @@ typedef CGAL::Linear_cell_complex_for_combinatorial_map<2, 3, #define NB_TESTS 21 // 0 ... 20 static unsigned int nbtests=0; -static const unsigned int ALL_TESTS=std::numeric_limits::max(); +static const unsigned int ALL_TESTS=(std::numeric_limits::max)(); enum Transformation // enum for the type of transformations { diff --git a/Surface_mesher/archive/include/CGAL/enriched_polyhedron.h b/Surface_mesher/archive/include/CGAL/enriched_polyhedron.h index a3511e99a60..f29d2bd4399 100644 --- a/Surface_mesher/archive/include/CGAL/enriched_polyhedron.h +++ b/Surface_mesher/archive/include/CGAL/enriched_polyhedron.h @@ -323,13 +323,13 @@ public : { const Point& p = pVertex->point(); - xmin = std::min(xmin,p.x()); - ymin = std::min(ymin,p.y()); - zmin = std::min(zmin,p.z()); + xmin = (std::min)(xmin,p.x()); + ymin = (std::min)(ymin,p.y()); + zmin = (std::min)(zmin,p.z()); - xmax = std::max(xmax,p.x()); - ymax = std::max(ymax,p.y()); - zmax = std::max(zmax,p.z()); + xmax = (std::max)(xmax,p.x()); + ymax = (std::max)(ymax,p.y()); + zmax = (std::max)(zmax,p.z()); } m_bbox = Iso_cuboid(xmin,ymin,zmin, xmax,ymax,zmax); diff --git a/Surface_mesher/include/CGAL/vtkSurfaceMesherContourFilter.h b/Surface_mesher/include/CGAL/vtkSurfaceMesherContourFilter.h index d578e2120db..2ed27b9df3a 100644 --- a/Surface_mesher/include/CGAL/vtkSurfaceMesherContourFilter.h +++ b/Surface_mesher/include/CGAL/vtkSurfaceMesherContourFilter.h @@ -130,8 +130,8 @@ int vtkCGALSurfaceMesherContourFilter::RequestData( return 0; Gray_level_image gray_level_image(image, Value); - GT::FT radius = std::max(image.xdim() * image.vx(), - std::max(image.ydim() * image.vy(), + GT::FT radius = (std::max)(image.xdim() * image.vx(), + (std::max)(image.ydim() * image.vy(), image.zdim() * image.vz()) ); GT::Sphere_3 bounding_sphere(GT::Point_3(image.xdim() * image.vx()/2., diff --git a/Triangulation/include/CGAL/internal/Combination_enumerator.h b/Triangulation/include/CGAL/internal/Combination_enumerator.h index 32899566b08..7ffee52ff62 100644 --- a/Triangulation/include/CGAL/internal/Combination_enumerator.h +++ b/Triangulation/include/CGAL/internal/Combination_enumerator.h @@ -37,11 +37,11 @@ public: // For generating all the combinations of |k| distinct elements in the // interval [min, max] (both included) - Combination_enumerator(const int k, const int min, const int max) - : combi_(k), k_(k), min_(min), max_(max), max_at_pos_0_(max + 1 - k) + Combination_enumerator(const int k, const int imin, const int imax) + : combi_(k), k_(k), min_(imin), max_(imax), max_at_pos_0_(imax + 1 - k) { - CGAL_assertion_msg( min <= max, "min is larger than max"); - CGAL_assertion_msg( 1 <= k && k <= ( max - min + 1 ), "wrong value of k"); + CGAL_assertion_msg( imin <= imax, "min is larger than max"); + CGAL_assertion_msg( 1 <= k && k <= ( imax - imin + 1 ), "wrong value of k"); init(); } From 1fe82bb713ffd15d1fa6a99e3d27acc6e2aac406 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Tue, 21 Apr 2020 13:13:41 +0200 Subject: [PATCH 2/4] Revert changes impacting packages that are currently under development --- Combinatorial_map/include/CGAL/Combinatorial_map.h | 6 +++--- Generalized_map/include/CGAL/Generalized_map.h | 6 +++--- .../Linear_cell_complex_2/surface_mesh/IO_off.cpp | 4 ++-- .../Linear_cell_complex_2/surface_mesh/Vector.h | 4 ++-- .../Linear_cell_complex_3/cgogn_performance_3.h | 2 +- .../Linear_cell_complex_3/lcc_performance_3.h | 2 +- .../openvolumemesh_performance.h | 2 +- .../path_homotopy_with_schema.cpp | 6 +++--- .../Surface_mesh_topology/path_homotopy.cpp | 2 +- .../include/CGAL/Path_on_surface.h | 4 ++-- .../internal/Minimal_quadrangulation.h | 14 +++++++------- .../include/CGAL/draw_face_graph_with_paths.h | 6 +++--- .../path_with_rle_deformation_tests.cpp | 2 +- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h index 829296e124f..538fc6fb7be 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h @@ -2631,7 +2631,7 @@ namespace CGAL { while (beta<1>(dd1)!=d2) { if (this->template is_free<2>(beta<1>(dd1))) - { return (std::numeric_limits::max)(); } + { return std::numeric_limits::max(); } ++res; dd1=beta<1, 2>(dd1); @@ -2653,7 +2653,7 @@ namespace CGAL { if (d2==beta<2>(d1)) { return 0; } if (this->template is_free<2>(d1) || this->template is_free<2>(d2)) - { return (std::numeric_limits::max)(); } + { return std::numeric_limits::max(); } d1=beta<2>(d1); d2=beta<2>(d2); @@ -2662,7 +2662,7 @@ namespace CGAL { while (beta<0>(dd1)!=d2) { if (this->template is_free<2>(beta<0>(dd1))) - { return (std::numeric_limits::max)(); } + { return std::numeric_limits::max(); } ++res; dd1=beta<0, 2>(dd1); diff --git a/Generalized_map/include/CGAL/Generalized_map.h b/Generalized_map/include/CGAL/Generalized_map.h index cff816951ce..bec3b9a187f 100644 --- a/Generalized_map/include/CGAL/Generalized_map.h +++ b/Generalized_map/include/CGAL/Generalized_map.h @@ -1734,7 +1734,7 @@ namespace CGAL { while (next(dd1)!=d2) { if (this->template is_free<2>(next(dd1))) - { return (std::numeric_limits::max)(); } + { return std::numeric_limits::max(); } ++res; dd1=opposite2(next(dd1)); @@ -1755,7 +1755,7 @@ namespace CGAL { if (d2==opposite2(d1)) { return 0; } if (this->template is_free<2>(d1) || this->template is_free<2>(d2)) - { return (std::numeric_limits::max)(); } + { return std::numeric_limits::max(); } d1=opposite2(d1); d2=opposite2(d2); @@ -1764,7 +1764,7 @@ namespace CGAL { while (previous(dd1)!=d2) { if (this->template is_free<2>(previous(dd1))) - { return (std::numeric_limits::max)(); } + { return std::numeric_limits::max(); } ++res; dd1=opposite2(previous(dd1)); diff --git a/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/IO_off.cpp b/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/IO_off.cpp index 9c7615c7d33..bdae916e43f 100644 --- a/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/IO_off.cpp +++ b/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/IO_off.cpp @@ -58,7 +58,7 @@ bool read_off_ascii(Surface_mesh& mesh, // #Vertice, #Faces, #Edges items = fscanf(in, "%d %d %d\n", (int*)&nV, (int*)&nF, (int*)&nE); mesh.clear(); - mesh.reserve(nV, (std::max)(3*nV, nE), nF); + mesh.reserve(nV, std::max(3*nV, nE), nF); // read vertices: pos [normal] [color] [texcoord] @@ -173,7 +173,7 @@ bool read_off_binary(Surface_mesh& mesh, read(in, nF); read(in, nE); mesh.clear(); - mesh.reserve(nV, (std::max)(3*nV, nE), nF); + mesh.reserve(nV, std::max(3*nV, nE), nF); // read vertices: pos [normal] [color] [texcoord] diff --git a/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/Vector.h b/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/Vector.h index 8f9487c28cc..7274501b5f4 100644 --- a/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/Vector.h +++ b/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/Vector.h @@ -210,7 +210,7 @@ public: Vector& normalize() { Scalar n = norm(*this); - if (n > (std::numeric_limits::min)()) + if (n > std::numeric_limits::min()) *this *= 1.0/n; return *this; } @@ -500,7 +500,7 @@ public: Vector& normalize() { Scalar n = norm(*this); - n = (n > (std::numeric_limits::min)()) ? 1.0/n : 0.0; + n = (n > std::numeric_limits::min()) ? 1.0/n : 0.0; x *= n; y *= n; z *= n; diff --git a/Linear_cell_complex/benchmark/Linear_cell_complex_3/cgogn_performance_3.h b/Linear_cell_complex/benchmark/Linear_cell_complex_3/cgogn_performance_3.h index fd91d3dde0a..b780ccd231d 100644 --- a/Linear_cell_complex/benchmark/Linear_cell_complex_3/cgogn_performance_3.h +++ b/Linear_cell_complex/benchmark/Linear_cell_complex_3/cgogn_performance_3.h @@ -63,7 +63,7 @@ private: Dart getShortestEdge() { - double weight = (std::numeric_limits::max)(); + double weight = std::numeric_limits::max(); Dart dart = NIL; bool boundary=false; diff --git a/Linear_cell_complex/benchmark/Linear_cell_complex_3/lcc_performance_3.h b/Linear_cell_complex/benchmark/Linear_cell_complex_3/lcc_performance_3.h index f16d3dd6243..1a901d1d34e 100644 --- a/Linear_cell_complex/benchmark/Linear_cell_complex_3/lcc_performance_3.h +++ b/Linear_cell_complex/benchmark/Linear_cell_complex_3/lcc_performance_3.h @@ -319,7 +319,7 @@ private: Dart_handle getShortestEdge() { - double weight = (std::numeric_limits::max)(); + double weight = std::numeric_limits::max(); Dart_handle dart = lcc.null_dart_handle; int m=lcc.get_new_mark(); diff --git a/Linear_cell_complex/benchmark/Linear_cell_complex_3/openvolumemesh_performance.h b/Linear_cell_complex/benchmark/Linear_cell_complex_3/openvolumemesh_performance.h index f9a30b83476..929d9ff8313 100644 --- a/Linear_cell_complex/benchmark/Linear_cell_complex_3/openvolumemesh_performance.h +++ b/Linear_cell_complex/benchmark/Linear_cell_complex_3/openvolumemesh_performance.h @@ -129,7 +129,7 @@ private: // Find the mesh's shortest edge EdgeHandle getShortestEdge() { - double max_weight = (std::numeric_limits::max)(); + double max_weight = std::numeric_limits::max(); EdgeHandle eh = Mesh::InvalidEdgeHandle; bool boundary=false; diff --git a/Surface_mesh_topology/benchmark/Surface_mesh_topology/path_homotopy_with_schema.cpp b/Surface_mesh_topology/benchmark/Surface_mesh_topology/path_homotopy_with_schema.cpp index 9ae235988b1..446367cf332 100644 --- a/Surface_mesh_topology/benchmark/Surface_mesh_topology/path_homotopy_with_schema.cpp +++ b/Surface_mesh_topology/benchmark/Surface_mesh_topology/path_homotopy_with_schema.cpp @@ -112,18 +112,18 @@ int main(int argc, char** argv) { if (i!=0) { - random=CGAL::Random(random.get_int(0, (std::numeric_limits::max)())); + random=CGAL::Random(random.get_int(0, std::numeric_limits::max())); } std::cout<<"Random seed: "<(random.get_int - (10, (std::max)(std::size_t(11), + (10, std::max(std::size_t(11), cm.number_of_darts()/10))); } if (!withD) { D=static_cast(random.get_int - (10, (std::max)(std::size_t(11), + (10, std::max(std::size_t(11), cm.number_of_darts()/10))); } diff --git a/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy.cpp b/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy.cpp index 6aa9325642b..68367231b6d 100644 --- a/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy.cpp +++ b/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy.cpp @@ -135,7 +135,7 @@ int main(int argc, char** argv) if (i!=0) { random=CGAL::Random(static_cast - (random.get_int(0, (std::numeric_limits::max)()))); + (random.get_int(0, std::numeric_limits::max()))); } std::cout<<"Random seed: "<(get_ith_dart(i))) || (get_next_flip(i) && get_map().template is_free<2>(get_next_dart(i)))) - { return (std::numeric_limits::max)(); } + { return std::numeric_limits::max(); } return m_map.positive_turn(get_ith_real_dart(i), get_ith_real_dart(next_index(i))); @@ -1123,7 +1123,7 @@ public: if ((!get_ith_flip(i) && get_map().template is_free<2>(get_ith_dart(i))) || (!get_next_flip(i) && get_map().template is_free<2>(get_next_dart(i)))) - { return (std::numeric_limits::max)(); } + { return std::numeric_limits::max(); } return m_map.positive_turn(get_opposite_ith_real_dart(next_index(i)), get_opposite_ith_real_dart(i)); diff --git a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Minimal_quadrangulation.h b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Minimal_quadrangulation.h index 6f8f0348634..2850e7f2554 100644 --- a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Minimal_quadrangulation.h +++ b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Minimal_quadrangulation.h @@ -408,7 +408,7 @@ public: { return 0; } if (get_reduced_map().is_marked(dh1, m_mark_hole)) - { return (std::numeric_limits::max)(); } + { return std::numeric_limits::max(); } Dart_const_handle ddh1=dh1; std::size_t res=1; @@ -420,7 +420,7 @@ public: ++res; ddh1=get_reduced_map().template beta<1, 2>(ddh1); if (get_reduced_map().is_marked(ddh1, m_mark_hole)) - { return (std::numeric_limits::max)(); } + { return std::numeric_limits::max(); } CGAL_assertion(!get_reduced_map().template is_free<1>(ddh1)); CGAL_assertion(get_reduced_map().template beta<1>(ddh1)==dh2 || ddh1!=dh1); @@ -449,7 +449,7 @@ public: if (get_reduced_map().is_marked (get_reduced_map().template beta <2>(dh1), m_mark_hole)) - { return (std::numeric_limits::max)(); } + { return std::numeric_limits::max(); } dh1=get_reduced_map().template beta<2>(dh1); dh2=get_reduced_map().template beta<2>(dh2); @@ -463,7 +463,7 @@ public: ++res; ddh1=get_reduced_map().template beta<0, 2>(ddh1); if (get_reduced_map().is_marked(ddh1, m_mark_hole)) - { return (std::numeric_limits::max)(); } + { return std::numeric_limits::max(); } CGAL_assertion(!get_reduced_map().template is_free<0>(ddh1)); CGAL_assertion(get_reduced_map().template beta<0>(ddh1)==dh2 || ddh1!=dh1); @@ -1183,7 +1183,7 @@ protected: return get_reduced_map().info(dh); #endif // CGAL_PWRLE_TURN_V2 std::cerr<<"Error: impossible to get dart id without method V2 or V3."<::max)(); + return std::numeric_limits::max(); } /// @return the positive turn given two darts using their ids (unsed for CGAL_PWRLE_TURN_V2 and V3) @@ -1204,7 +1204,7 @@ protected: get_dart_id(dh2)-get_dart_id(dh1)> static_cast(get_reduced_map().template info<0>(dh1))) // the gap is more than the degree, so we crossed a hole {// so we return an "infinite" value - return (std::numeric_limits::max)(); + return std::numeric_limits::max(); } return get_dart_id(dh2)-get_dart_id(dh1); } @@ -1227,7 +1227,7 @@ protected: get_dart_id(dh1)-get_dart_id(dh2)> static_cast(get_reduced_map().template info<0>(dh1))) // the gap is more than the degree, so we crossed a hole {// so we return an "infinite" value - return (std::numeric_limits::max)(); + return std::numeric_limits::max(); } return get_dart_id(dh1)-get_dart_id(dh2); } diff --git a/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h b/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h index 7a6e5f03950..63355559b65 100644 --- a/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h +++ b/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h @@ -110,7 +110,7 @@ public: m_current_path(m_paths->size()), m_current_dart(0), m_draw_marked_darts(true), - m_amark(amark==(std::numeric_limits::max)()? + m_amark(amark==std::numeric_limits::max()? LCC::INVALID_MARK:amark) { m_current_dart=lcc.number_of_darts(); compute_elements(); @@ -343,7 +343,7 @@ template void draw(const Mesh& alcc, const std::vector >& paths, const char* title="Mesh Viewer", - std::size_t amark=(std::numeric_limits::max)(), + std::size_t amark=std::numeric_limits::max(), bool nofill=false, const DrawingFunctor& drawing_functor=DrawingFunctor()) { @@ -371,7 +371,7 @@ template void draw(const Mesh& alcc, const std::vector >& paths, const char* title="LCC Viewer", - std::size_t amark=(std::numeric_limits::max)(), + std::size_t amark=std::numeric_limits::max(), bool nofill=false) { DefaultDrawingFunctorLCC f; diff --git a/Surface_mesh_topology/test/Surface_mesh_topology/path_with_rle_deformation_tests.cpp b/Surface_mesh_topology/test/Surface_mesh_topology/path_with_rle_deformation_tests.cpp index 90a17e8f79b..ee72cfc85f9 100644 --- a/Surface_mesh_topology/test/Surface_mesh_topology/path_with_rle_deformation_tests.cpp +++ b/Surface_mesh_topology/test/Surface_mesh_topology/path_with_rle_deformation_tests.cpp @@ -35,7 +35,7 @@ typedef CGAL::Linear_cell_complex_for_combinatorial_map<2, 3, #define NB_TESTS 21 // 0 ... 20 static unsigned int nbtests=0; -static const unsigned int ALL_TESTS=(std::numeric_limits::max)(); +static const unsigned int ALL_TESTS=std::numeric_limits::max(); enum Transformation // enum for the type of transformations { From 9bf61b7977c861671020d48a20706aef9fa2d759 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Wed, 22 Apr 2020 11:02:16 +0200 Subject: [PATCH 3/4] more fixes --- CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/minkowski.cpp | 2 +- CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/svdlinf.cpp | 4 ++-- CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h | 4 ++-- Kernel_23/include/CGAL/Kernel/hash_functions.h | 8 ++++---- Kernel_d/test/Kernel_d/Iso_box_d_with_Cartesian.cpp | 4 ++-- .../test/Kernel_d/Iso_box_d_with_homogeneous.cpp | 4 ++-- .../Polygon_mesh_processing/polygon_mesh_slicer.cpp | 6 +++--- .../Plugins/AABB_tree/Do_trees_intersect_plugin.cpp | 6 +++--- .../Plugins/PCA/Affine_transform_plugin.cpp | 12 ++++++------ 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp b/CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp index b0edf574baa..643bc96f2c7 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp @@ -135,8 +135,8 @@ void diagrammeIpelet::protected_run(int fn) Kernel::FT incr_len=(fn<2)?50:75; //slightly increase the size of the Bbox - bbox=Iso_rectangle_2(bbox.min()+Kernel::Vector_2(-incr_len,-incr_len), - bbox.max()+Kernel::Vector_2(incr_len,incr_len)); + bbox=Iso_rectangle_2((bbox.min)()+Kernel::Vector_2(-incr_len,-incr_len), + (bbox.max)()+Kernel::Vector_2(incr_len,incr_len)); diff --git a/CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp b/CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp index 2bc329c15df..a450cac2c7e 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp @@ -90,8 +90,8 @@ void IpeletMesh2::protected_run(int fn) double alpha=0; - int x=static_cast( floor(bbox.max().x()-bbox.min().x()) ); - int y=static_cast( floor(bbox.max().y()-bbox.min().y()) ); + int x=static_cast( floor((bbox.max)().x()-(bbox.min)().x()) ); + int y=static_cast( floor((bbox.max)().y()-(bbox.min)().y()) ); int ret_val; boost::tie(ret_val,alpha)=request_value_from_user((boost::format("Max edge length (BBox %1%x%2%)") % x % y).str() ); diff --git a/CGAL_ipelets/demo/CGAL_ipelets/minkowski.cpp b/CGAL_ipelets/demo/CGAL_ipelets/minkowski.cpp index 92cd9c40b34..03877ef424e 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/minkowski.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/minkowski.cpp @@ -76,7 +76,7 @@ void SubSelectIpelet::protected_run(int fn) for (std::list::iterator it=cir_list.begin();it!=cir_list.end();++it) r_offsets.push_back(sqrt(CGAL::to_double(it->squared_radius()))); - IpeMatrix tfm (1,0,0,1,-CGAL::to_double(bbox.min().x()),-CGAL::to_double(bbox.min().y())); + IpeMatrix tfm (1,0,0,1,-CGAL::to_double((bbox.min)().x()),-CGAL::to_double((bbox.min)().y())); for (std::list::iterator it=pol_list.begin();it!=pol_list.end();++it) if(!it->is_simple()){ diff --git a/CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp b/CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp index 42b85c79dd1..3727c487040 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp @@ -95,8 +95,8 @@ void MregularIpelet::protected_run(int fn) draw_in_ipe(rt); else{//Draw kth Power diagram double incr_len=75; - bbox=Iso_rectangle_2(bbox.min()+Kernel::Vector_2(-incr_len,-incr_len), - bbox.max()+Kernel::Vector_2(incr_len,incr_len)); + bbox=Iso_rectangle_2((bbox.min)()+Kernel::Vector_2(-incr_len,-incr_len), + (bbox.max)()+Kernel::Vector_2(incr_len,incr_len)); draw_dual_in_ipe(rt,bbox); //draw Voronoi Diagram } } diff --git a/CGAL_ipelets/demo/CGAL_ipelets/svdlinf.cpp b/CGAL_ipelets/demo/CGAL_ipelets/svdlinf.cpp index 9bef1fbe29c..392fffb7aa0 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/svdlinf.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/svdlinf.cpp @@ -96,8 +96,8 @@ namespace CGAL_svdlinf { Kernel::FT incr_len = 75; // slightly increase the size of the bbox bbox = Iso_rectangle_2( - bbox.min()+Kernel::Vector_2(-incr_len,-incr_len), - bbox.max()+Kernel::Vector_2(incr_len,incr_len)); + (bbox.min)()+Kernel::Vector_2(-incr_len,-incr_len), + (bbox.max)()+Kernel::Vector_2(incr_len,incr_len)); for (std::list::iterator sit = sg_list.begin(); diff --git a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h index 1fb9f94d78d..de68972f1fb 100644 --- a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h +++ b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h @@ -256,8 +256,8 @@ public: _page->DeselectAll(); Iso_rectangle_2 bbox_cgal( - static_cast(bbox_ipe.Min().iX),static_cast(bbox_ipe.Min().iY), - static_cast(bbox_ipe.Max().iX),static_cast(bbox_ipe.Max().iY) + static_cast((bbox_ipe.Min)().iX),static_cast((bbox_ipe.Min)().iY), + static_cast((bbox_ipe.Max)().iX),static_cast((bbox_ipe.Max)().iY) ); return bbox_cgal; diff --git a/Kernel_23/include/CGAL/Kernel/hash_functions.h b/Kernel_23/include/CGAL/Kernel/hash_functions.h index 145d58bd38c..a68197941d8 100644 --- a/Kernel_23/include/CGAL/Kernel/hash_functions.h +++ b/Kernel_23/include/CGAL/Kernel/hash_functions.h @@ -57,8 +57,8 @@ template inline std::enable_if_t::value, std::size_t> hash_value (const Iso_rectangle_2& iso_rectangle) { - std::size_t result = hash_value(iso_rectangle.min()); - boost::hash_combine(result, hash_value(iso_rectangle.max())); + std::size_t result = hash_value((iso_rectangle.min)()); + boost::hash_combine(result, hash_value((iso_rectangle.max)())); return result; } @@ -126,8 +126,8 @@ template inline std::enable_if_t::value, std::size_t> hash_value (const Iso_cuboid_3& iso_cuboid) { - std::size_t result = hash_value(iso_cuboid.min()); - boost::hash_combine(result, hash_value(iso_cuboid.max())); + std::size_t result = hash_value((iso_cuboid.min)()); + boost::hash_combine(result, hash_value((iso_cuboid.max)())); return result; } diff --git a/Kernel_d/test/Kernel_d/Iso_box_d_with_Cartesian.cpp b/Kernel_d/test/Kernel_d/Iso_box_d_with_Cartesian.cpp index 0ea94fb0992..38b9ec62d7d 100644 --- a/Kernel_d/test/Kernel_d/Iso_box_d_with_Cartesian.cpp +++ b/Kernel_d/test/Kernel_d/Iso_box_d_with_Cartesian.cpp @@ -91,8 +91,8 @@ int main() { assert(b1.bounded_side(qq1)==CGAL::ON_BOUNDARY); assert(b1.bounded_side(qq4)==CGAL::ON_UNBOUNDED_SIDE); assert(b1.bounded_side(mm1)==CGAL::ON_BOUNDED_SIDE); - // std::cout << "b1.min()=" << b1.min() << std::endl; - // std::cout << "b1.max()=" << b1.max() << std::endl; + // std::cout << "(b1.min)()=" << (b1.min)() << std::endl; + // std::cout << "(b1.max)()=" << (b1.max)() << std::endl; std::cout << "volume of b1=" << b1.volume() << std::endl; std::cout << "volume of b4=" << b4.volume() << std::endl; std::cout << "volume of b5=" << b5.volume() << std::endl; diff --git a/Kernel_d/test/Kernel_d/Iso_box_d_with_homogeneous.cpp b/Kernel_d/test/Kernel_d/Iso_box_d_with_homogeneous.cpp index 8af8cbc3fad..8db8c7ddc7b 100644 --- a/Kernel_d/test/Kernel_d/Iso_box_d_with_homogeneous.cpp +++ b/Kernel_d/test/Kernel_d/Iso_box_d_with_homogeneous.cpp @@ -94,8 +94,8 @@ int main() { assert(b1.bounded_side(qq1)==CGAL::ON_BOUNDARY); assert(b1.bounded_side(qq4)==CGAL::ON_UNBOUNDED_SIDE); assert(b1.bounded_side(mm1)==CGAL::ON_BOUNDED_SIDE); - // std::cout << "b1.min()=" << b1.min() << std::endl; - // std::cout << "b1.max()=" << b1.max() << std::endl; + // std::cout << "(b1.min)()=" << (b1.min)() << std::endl; + // std::cout << "(b1.max)()=" << (b1.max)() << std::endl; std::cout << "volume of b1=" << b1.volume() << std::endl; std::cout << "volume of b4=" << b4.volume() << std::endl; std::cout << "volume of b5=" << b5.volume() << std::endl; diff --git a/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/polygon_mesh_slicer.cpp b/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/polygon_mesh_slicer.cpp index 03d0337f915..86c308e45ea 100644 --- a/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/polygon_mesh_slicer.cpp +++ b/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/polygon_mesh_slicer.cpp @@ -106,9 +106,9 @@ int main(int argc, char* argv[]) t.start(); std::cerr << "bbox"<< std::endl; Iso_cuboid_3 ic = CGAL::bounding_box(points(m).begin(), points(m).end()); - Point_3 p = midpoint(ic.min(), ic.max()); - double zmin = ic.min().z(); - double zmax = ic.max().z(); + Point_3 p = midpoint((ic.min)(), (ic.max)()); + double zmin = (ic.min)().z(); + double zmax = (ic.max)().z(); double delta = (zmax - zmin)/N; std::cerr << "slicer"<< std::endl; diff --git a/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Do_trees_intersect_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Do_trees_intersect_plugin.cpp index dfa516c1333..08a8ef803e4 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Do_trees_intersect_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Do_trees_intersect_plugin.cpp @@ -102,9 +102,9 @@ private Q_SLOTS: connect(item, &Scene_surface_mesh_item::aboutToBeDestroyed, this, &DoTreesIntersectplugin::cleanup); - CGAL::qglviewer::Vec pos((item->bbox().min(0) + item->bbox().max(0))/2.0, - (item->bbox().min(1) + item->bbox().max(1))/2.0, - (item->bbox().min(2) + item->bbox().max(2))/2.0); + CGAL::qglviewer::Vec pos(((item->bbox().min)(0) + (item->bbox().max)(0))/2.0, + ((item->bbox().min)(1) + (item->bbox().max)(1))/2.0, + ((item->bbox().min)(2) + (item->bbox().max)(2))/2.0); Scene_movable_sm_item* mov_item = new Scene_movable_sm_item(pos,item->face_graph(),""); connect(mov_item->manipulatedFrame(), &CGAL::qglviewer::ManipulatedFrame::modified, diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp index 57700e79d13..0eebfb574ab 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp @@ -417,12 +417,12 @@ void Polyhedron_demo_affine_transform_plugin::grid() Scene_item::Bbox b = item->bbox(); - double x_t(CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3(b.min(0), b.min(1), b.min(2)), - Kernel::Point_3(b.max(0), b.min(1), b.min(2))))), - y_t(CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3(b.min(0), b.min(1), b.min(2)), - Kernel::Point_3(b.min(0), b.max(1), b.min(2))))), - z_t(CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3(b.min(0), b.min(1), b.min(2)), - Kernel::Point_3(b.min(0), b.min(1), b.max(2))))); + double x_t(CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3((b.min)(0), (b.min)(1), (b.min)(2)), + Kernel::Point_3((b.max)(0), (b.min)(1), (b.min)(2))))), + y_t(CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3((b.min)(0), (b.min)(1), (b.min)(2)), + Kernel::Point_3((b.min)(0), (b.max)(1), (b.min)(2))))), + z_t(CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3((b.min)(0), (b.min)(1), (b.min)(2)), + Kernel::Point_3((b.min)(0), (b.min)(1), (b.max)(2))))); GridDialog dialog(mw); dialog.x_space_doubleSpinBox->setValue(x_t); From c74bca8d653e4c78977dc50ee7fdc8bdb4d095fc Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Thu, 23 Apr 2020 09:27:26 +0200 Subject: [PATCH 4/4] More errors and warnigns --- .../box_d_do_intersect_polylines.cpp | 24 ++++++------ .../test_repair_polygon_soup.cpp | 38 +++++++++---------- .../Point_set_item_classification.cpp | 2 +- .../PCA/Scene_facegraph_transform_item.cpp | 8 ++-- .../Surface_mesh/Parameterization_plugin.cpp | 20 +++++----- 5 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Box_intersection_d/examples/Box_intersection_d/box_d_do_intersect_polylines.cpp b/Box_intersection_d/examples/Box_intersection_d/box_d_do_intersect_polylines.cpp index c5558b246f8..f026b909d3e 100644 --- a/Box_intersection_d/examples/Box_intersection_d/box_d_do_intersect_polylines.cpp +++ b/Box_intersection_d/examples/Box_intersection_d/box_d_do_intersect_polylines.cpp @@ -4,15 +4,15 @@ #include -template +template class Polylines_do_intersect { - typedef typename Polyline::const_iterator Iterator; + typedef typename Poly::const_iterator Iterator; typedef typename std::iterator_traits::value_type Point_2; typedef typename CGAL::Kernel_traits::Kernel::Segment_2 Segment_2; typedef CGAL::Bbox_2 Bbox_2; - const Polyline& pA, &pB; + const Poly& pA, &pB; struct Box : public CGAL::Box_intersection_d::Box_with_handle_d { @@ -31,9 +31,9 @@ class Polylines_do_intersect class Overlap { - const Polyline& pA, &pB; + const Poly& pA, &pB; public: - Overlap(const Polyline& pA, const Polyline& pB) + Overlap(const Poly& pA, const Poly& pB) : pA(pA), pB(pB) {} @@ -49,7 +49,7 @@ class Polylines_do_intersect public: - Polylines_do_intersect(const Polyline& pA, const Polyline& pB) + Polylines_do_intersect(const Poly& pA, const Poly& pB) : pA(pA), pB(pB) {} @@ -83,22 +83,22 @@ public: }; -template -bool polylines_do_intersect(const Polyline& pA,const Polyline& pB) +template +bool polylines_do_intersect(const Poly& pA,const Poly& pB) { - Polylines_do_intersect pdi(pA,pB); + Polylines_do_intersect pdi(pA,pB); return pdi(); } typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef K::Point_2 Point_2; -typedef std::vector Polyline; +typedef std::vector CGAL_polyline; int main() { - Polyline pA = { Point_2(0,0), Point_2(1,0) }; - Polyline pB = { Point_2(0,0), Point_2(0,1), Point_2(2,1) , Point_2(1,0)}; + CGAL_polyline pA = { Point_2(0,0), Point_2(1,0) }; + CGAL_polyline pB = { Point_2(0,0), Point_2(0,1), Point_2(2,1) , Point_2(1,0)}; if(polylines_do_intersect(pA,pB)){ std::cout << "intersection" << std::endl; diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_repair_polygon_soup.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_repair_polygon_soup.cpp index eec039ec43e..dd1ac38d01a 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_repair_polygon_soup.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_repair_polygon_soup.cpp @@ -19,7 +19,7 @@ typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef K::Point_3 Point_3; typedef CGAL::Surface_mesh Mesh; -typedef std::vector Polygon; +typedef std::vector CGAL_polygon; void test_polygon_canonicalization(const bool verbose = false) { @@ -34,8 +34,8 @@ void test_polygon_canonicalization(const bool verbose = false) points.push_back(Point_3(1,1,-2)); // #5 // empty - Polygon polygon; - Polygon canonical_polygon = PMP::internal::construct_canonical_polygon(points, polygon, K()); + CGAL_polygon polygon; + CGAL_polygon canonical_polygon = PMP::internal::construct_canonical_polygon(points, polygon, K()); assert(canonical_polygon.empty()); // 1 point @@ -76,7 +76,7 @@ void test_polygon_canonicalization(const bool verbose = false) // all cyclic permutations for(std::size_t i=0, end=polygon.size(); i points; - std::vector polygons; + std::vector polygons; // empty std::size_t res = PMP::merge_duplicate_points_in_polygon_soup(points, polygons); @@ -126,7 +126,7 @@ void test_merge_duplicate_points(const bool /*verbose*/ = false) points.push_back(Point_3(1,1,0)); // #5 // identical to #2 points.push_back(Point_3(0,0,0)); // #6 // idental to #0 - Polygon polygon; + CGAL_polygon polygon; polygon.push_back(0); polygon.push_back(1); polygon.push_back(2); polygons.push_back(polygon); @@ -146,7 +146,7 @@ void test_merge_duplicate_points(const bool /*verbose*/ = false) for(std::size_t i=0, psn=polygons.size(); i points; - std::vector polygons; + std::vector polygons; points.push_back(Point_3(0,0,0)); // #0 points.push_back(Point_3(1,0,0)); // #1 @@ -180,7 +180,7 @@ void test_merge_duplicate_polygons(const bool /*verbose*/ = false) // ------------------------------------------------------- // 1 polygon - Polygon polygon; + CGAL_polygon polygon; polygon.push_back(0); polygon.push_back(1); polygon.push_back(2); polygons.push_back(polygon); @@ -257,7 +257,7 @@ void test_merge_duplicate_polygons(const bool /*verbose*/ = false) assert(all_duplicate_polygons[0].size() == 2 && all_duplicate_polygons[1].size() == 3); // Keep one for each duplicate - std::vector polygons_copy(polygons); + std::vector polygons_copy(polygons); res = PMP::merge_duplicate_polygons_in_polygon_soup(points, polygons_copy, params::all_default()); assert(res == 3 && polygons_copy.size() == 3); @@ -281,7 +281,7 @@ void test_simplify_polygons(const bool /*verbose*/ = false) std::cout << "test simplify_polygons... " << std::endl; std::vector points; - std::vector polygons; + std::vector polygons; points.push_back(Point_3(0,0,0)); // #0 points.push_back(Point_3(1,2,0)); // #1 @@ -292,7 +292,7 @@ void test_simplify_polygons(const bool /*verbose*/ = false) points.push_back(Point_3(0,0,0)); // #6 // ------ - Polygon polygon; + CGAL_polygon polygon; polygon.push_back(0); polygon.push_back(2); polygon.push_back(4); polygons.push_back(polygon); @@ -355,13 +355,13 @@ void test_remove_invalid_polygons(const bool /*verbose*/ = false) // points are not actually needed since only the size of the polygons is considered std::vector points; - std::vector polygons; + std::vector polygons; std::size_t res = PMP::internal::remove_invalid_polygons_in_polygon_soup(points, polygons); assert(res == 0 && polygons.size() == 0); // non-trivial polygon - Polygon polygon; + CGAL_polygon polygon; polygon.push_back(0); polygon.push_back(2); polygon.push_back(4); polygons.push_back(polygon); @@ -431,7 +431,7 @@ void test_remove_isolated_points(const bool verbose = false) std::cout << "test remove_isolated_points... " << std::endl; std::vector points; - std::vector polygons; + std::vector polygons; // everything empty std::size_t res = test_remove_isolated_points_data_set(points, polygons, verbose); @@ -449,7 +449,7 @@ void test_remove_isolated_points(const bool verbose = false) res = test_remove_isolated_points_data_set(points_copy, polygons, verbose); assert(res == 6 && points_copy.empty() && polygons.empty()); - Polygon polygon; + CGAL_polygon polygon; polygon.push_back(0); polygon.push_back(2); polygon.push_back(4); polygons.push_back(polygon); @@ -467,7 +467,7 @@ void test_slit_pinched_polygons(const bool /*verbose*/ = false) std::cout << "test split_pinched_polygons... " << std::endl; std::vector points; - std::vector polygons; + std::vector polygons; // everything empty std::size_t res = PMP::internal::split_pinched_polygons_in_polygon_soup(points, polygons); @@ -481,7 +481,7 @@ void test_slit_pinched_polygons(const bool /*verbose*/ = false) points.push_back(Point_3(1,1,0)); // #5 // no pinch - Polygon polygon; + CGAL_polygon polygon; polygon.push_back(0); polygon.push_back(2); polygon.push_back(4); polygons.push_back(polygon); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp b/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp index bdca3ace2e5..b284a275a42 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp @@ -429,7 +429,7 @@ void Point_set_item_classification::change_color (int index, float* vmin, float* for (Point_set::const_iterator it = m_points->point_set()->begin(); it != m_points->point_set()->first_selected(); ++ it) { - float v = std::max (0.f, (std::min)(1.f, m_label_probabilities[corrected_index][*it])); + float v = (std::max)(0.f, (std::min)(1.f, m_label_probabilities[corrected_index][*it])); m_points->point_set()->set_color(*it, ramp.r(v) * 255, ramp.g(v) * 255, ramp.b(v) * 255); } } diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_facegraph_transform_item.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_facegraph_transform_item.cpp index 83348567eec..71cc00c5933 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_facegraph_transform_item.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_facegraph_transform_item.cpp @@ -123,10 +123,10 @@ Scene_facegraph_transform_item::compute_bbox() const { ++it) { bbox = bbox + get(vpmap, *it).bbox(); } - CGAL::qglviewer::Vec min(bbox.xmin(),bbox.ymin(),bbox.zmin()); - CGAL::qglviewer::Vec max(bbox.xmax(),bbox.ymax(),bbox.zmax()); - setBbox(Bbox(min.x,min.y,min.z, - max.x,max.y,max.z)); + CGAL::qglviewer::Vec vmin(bbox.xmin(),bbox.ymin(),bbox.zmin()); + CGAL::qglviewer::Vec vmax(bbox.xmax(),bbox.ymax(),bbox.zmax()); + setBbox(Bbox(vmin.x,vmin.y,vmin.z, + vmax.x,vmax.y,vmax.z)); } diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp index 8a945f71d76..ba2a234e0fa 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp @@ -907,7 +907,7 @@ void Polyhedron_demo_parameterization_plugin::parameterize(const Parameterizatio } //end for each component QApplication::restoreOverrideCursor(); - QPointF min(FLT_MAX, FLT_MAX), max(-FLT_MAX, -FLT_MAX); + QPointF pmin(FLT_MAX, FLT_MAX), pmax(-FLT_MAX, -FLT_MAX); SMesh::Property_map umap; SMesh::Property_map vmap; @@ -926,14 +926,14 @@ void Polyhedron_demo_parameterization_plugin::parameterize(const Parameterizatio FT v = uv_pm[target(hd, sMesh)].y(); put(umap, *it, static_cast(u)); put(vmap, *it, static_cast(v)); - if(umax.x()) - max.setX(u); - if(vmax.y()) - max.setY(v); + if(upmax.x()) + pmax.setX(u); + if(vpmax.y()) + pmax.setY(v); } Components* components = new Components(0); @@ -948,7 +948,7 @@ void Polyhedron_demo_parameterization_plugin::parameterize(const Parameterizatio } Scene_textured_facegraph_item* new_item = new Scene_textured_facegraph_item(tMesh); - UVItem *projection = new UVItem(components,new_item->textured_face_graph(), uv_borders, QRectF(min, max)); + UVItem *projection = new UVItem(components,new_item->textured_face_graph(), uv_borders, QRectF(pmin, pmax)); projection->set_item_name(new_item_name); new_item->setName(new_item_name);