This commit is contained in:
Guillaume Damiand 2020-04-21 08:49:10 +02:00
parent 9d07d145c4
commit a09b8b10fc
5 changed files with 10 additions and 10 deletions

View File

@ -2749,7 +2749,7 @@ namespace CGAL {
while (beta<1>(dd1)!=d2)
{
if (this->template is_free<2>(beta<1>(dd1)))
{ return std::numeric_limits<std::size_t>::max(); }
{ return (std::numeric_limits<std::size_t>::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<std::size_t>::max(); }
{ return (std::numeric_limits<std::size_t>::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<std::size_t>::max(); }
{ return (std::numeric_limits<std::size_t>::max)(); }
++res;
dd1=beta<0, 2>(dd1);

View File

@ -1873,7 +1873,7 @@ namespace CGAL {
while (next(dd1)!=d2)
{
if (this->template is_free<2>(next(dd1)))
{ return std::numeric_limits<std::size_t>::max(); }
{ return (std::numeric_limits<std::size_t>::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<std::size_t>::max(); }
{ return (std::numeric_limits<std::size_t>::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<std::size_t>::max(); }
{ return (std::numeric_limits<std::size_t>::max)(); }
++res;
dd1=opposite2(previous(dd1));

View File

@ -38,7 +38,7 @@ class Face_graph_wrapper
public:
typedef HEG_ HEG;
typedef Face_graph_wrapper<HEG> Self;
typedef std::size_t size_type;
typedef boost::uint32_t /*std::size_t*/ size_type;
typedef Self Refs;
struct Dart_container

View File

@ -124,7 +124,7 @@ public:
std::vector<Original_dart_const_handle> cycle;
cycle.reserve(edgewidth_of_radial_map.length());
for (int i=0, n=edgewidth_of_radial_map.length(); i<n; i++)
for (std::size_t i=0, n=edgewidth_of_radial_map.length(); i<n; i++)
{
Dart_handle dh=m_radial_map.dart_handle
(const_cast<typename Local_map::Dart&>(*edgewidth_of_radial_map.get_ith_real_dart(i)));

View File

@ -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<Point> v1, v2, v3;
for (std::size_t i=0; i<cycle1.length(); ++i)
@ -356,7 +356,7 @@ bool unsew_edge_width_repeatedly_in_unweighted_gmap() {
return false;
}
std::vector<unsigned int> cycle_lengths;
unsigned int length;
std::size_t length;
do {
CGAL::Surface_mesh_topology::Curves_on_surface_topology<LCC_for_GMap_2> cst(lcc_gm);
CGAL::Surface_mesh_topology::Path_on_surface<LCC_for_GMap_2> cycle = cst.compute_edge_width();