From a09b8b10fc2c4bc101a38f3808649e562e8b0d5a Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Tue, 21 Apr 2020 08:49:10 +0200 Subject: [PATCH] Warnings --- Combinatorial_map/include/CGAL/Combinatorial_map.h | 6 +++--- Generalized_map/include/CGAL/Generalized_map.h | 6 +++--- Surface_mesh_topology/include/CGAL/Face_graph_wrapper.h | 2 +- .../include/CGAL/Surface_mesh_topology/internal/Facewidth.h | 2 +- .../shortest_noncontractible_cycle_tests.cpp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h index 67287a27f8b..6185d1ad548 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h @@ -2749,7 +2749,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); @@ -2771,7 +2771,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); @@ -2780,7 +2780,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 fcf7addf65c..47eb38dc6aa 100644 --- a/Generalized_map/include/CGAL/Generalized_map.h +++ b/Generalized_map/include/CGAL/Generalized_map.h @@ -1873,7 +1873,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)); @@ -1894,7 +1894,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); @@ -1903,7 +1903,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/Surface_mesh_topology/include/CGAL/Face_graph_wrapper.h b/Surface_mesh_topology/include/CGAL/Face_graph_wrapper.h index f250e30b3ab..dc3d8f81148 100644 --- a/Surface_mesh_topology/include/CGAL/Face_graph_wrapper.h +++ b/Surface_mesh_topology/include/CGAL/Face_graph_wrapper.h @@ -38,7 +38,7 @@ class Face_graph_wrapper public: typedef HEG_ HEG; typedef Face_graph_wrapper Self; - typedef std::size_t size_type; + typedef boost::uint32_t /*std::size_t*/ size_type; typedef Self Refs; struct Dart_container diff --git a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Facewidth.h b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Facewidth.h index 2b0bf343888..d24e8ae9ff2 100644 --- a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Facewidth.h +++ b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Facewidth.h @@ -124,7 +124,7 @@ public: std::vector cycle; cycle.reserve(edgewidth_of_radial_map.length()); - for (int i=0, n=edgewidth_of_radial_map.length(); i(*edgewidth_of_radial_map.get_ith_real_dart(i))); diff --git a/Surface_mesh_topology/test/Surface_mesh_topology/shortest_noncontractible_cycle_tests.cpp b/Surface_mesh_topology/test/Surface_mesh_topology/shortest_noncontractible_cycle_tests.cpp index 8cce2d38ec2..9cb2d8df145 100644 --- a/Surface_mesh_topology/test/Surface_mesh_topology/shortest_noncontractible_cycle_tests.cpp +++ b/Surface_mesh_topology/test/Surface_mesh_topology/shortest_noncontractible_cycle_tests.cpp @@ -248,7 +248,7 @@ bool edge_width_in_weighted_cmap_gmap_mesh() { return false; } - double cycle_length1, cycle_length2, cycle_length3; + double cycle_length1=0, cycle_length2=0, cycle_length3=0; std::vector v1, v2, v3; for (std::size_t i=0; i cycle_lengths; - unsigned int length; + std::size_t length; do { CGAL::Surface_mesh_topology::Curves_on_surface_topology cst(lcc_gm); CGAL::Surface_mesh_topology::Path_on_surface cycle = cst.compute_edge_width();