Skip to content

Commit 8a07318

Browse files
committed
Merge pull request #283 from lrineau/Arrangement-fix_warning_enumeral_conditional_mismatch-GF
Fix a warning in Arr_2 (version CGAL-4.6)
2 parents 133bc0d + 2cdbe63 commit 8a07318

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,7 +1593,7 @@ namespace CGAL {
15931593
*oi++ = make_object(p);
15941594
return oi;
15951595
}
1596-
dir1 == SMALLER ? ++i1 : (i1 != 0) ? --i1 : INVALID_INDEX;
1596+
dir1 == SMALLER ? ++i1 : (i1 != 0) ? --i1 : std::size_t(INVALID_INDEX);
15971597
left_res = EQUAL;
15981598
}
15991599
}
@@ -1615,7 +1615,7 @@ namespace CGAL {
16151615
return oi;
16161616
}
16171617

1618-
dir2 == SMALLER ? ++i2 : (i2 != 0) ? --i2 : INVALID_INDEX;
1618+
dir2 == SMALLER ? ++i2 : (i2 != 0) ? --i2 : std::size_t(INVALID_INDEX);
16191619
left_res = EQUAL;
16201620
}
16211621
}
@@ -2772,7 +2772,7 @@ namespace CGAL {
27722772
// segment that is closest to the point. Otherwise, the point is not
27732773
// in the x-range of the polyline.
27742774
return (is_vertical_2_object()(cv)) ?
2775-
((res_to == SMALLER) ? from : to) : INVALID_INDEX;
2775+
((res_to == SMALLER) ? from : to) : std::size_t(INVALID_INDEX);
27762776

27772777
// Perform a binary search to locate the segment that contains q in its
27782778
// range:

0 commit comments

Comments
 (0)