songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix conversion warnigns

This commit is contained in:
Maxime Gimeno 2021-01-26 09:55:20 +01:00
parent ffa019712b
commit d78842712c
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Nef_2/include/CGAL/Nef_2/PM_io_parser.h
View File

@ -200,7 +200,7 @@ bool PM_io_parser<PMDEC>::read_vertex(Vertex_handle v)
!(in >> p) ||
!check_sep("}") ) return false;
if(!(f >= 0 && ((iso && f < fn) || (!iso && f < en))))
if(!(f >= 0 && ((iso && (std::size_t)f < fn) || (!iso && (std::size_t)f < en))))
{
in.setstate(std::ios_base::badbit);
return false;
@ -276,14 +276,14 @@ bool PM_io_parser<PMDEC>::read_face(Face_handle f)
int n, ei, vi; Mark m;
if ( !(in >> n) || !check_sep("{") ) return false;
if ( !(in >> ei) || !check_sep(",") ) return false;
if (ei >= 0 && ei < en)
if (ei >= 0 && (std::size_t) ei < en)
{
f->set_halfedge(Halfedge_of[ei]);
}
while (in >> ei) {
CGAL_assertion_msg(ei >= 0 && (std::size_t) ei < en, "wrong index in face cycle list.");
if (!(ei >= 0 && ei < en))
if (!(ei >= 0 && (std::size_t)ei < en))
{
in.setstate(std::ios_base::badbit);
return false;
@ -293,7 +293,7 @@ bool PM_io_parser<PMDEC>::read_face(Face_handle f)
if (!check_sep(",")) { return false; }
while (in >> vi) {
CGAL_assertion_msg(vi >= 0 && (std::size_t) vi < vn, "wrong index in iso vertex list.");
if (!(vi >= 0 && vi < vn))
if (!(vi >= 0 && (std::size_t)vi < vn))
{
in.setstate(std::ios_base::badbit);
return false;

18
Nef_3/include/CGAL/Nef_3/SNC_io_parser.h
View File

@ -1579,7 +1579,7 @@ read_vertex(Vertex_handle vh) {
vh->sncp() = this->sncp();
in >> index;
if(index >= int(en))
if(index >= (int)en)
{
in.setstate(std::ios_base::badbit);
return false;
@ -2016,7 +2016,7 @@ read_sloop(SHalfloop_handle slh) {
OK = OK && test_string("{");
in >> index;
if(index < 0 || index >= sln)
if(index < 0 || index >= (int)(sln))
{
in.setstate(std::ios_base::badbit);
return false;
@ -2024,7 +2024,7 @@ read_sloop(SHalfloop_handle slh) {
slh->twin() = SLoop_of[index];
OK = OK && test_string(",");
in >> index;
if(index < 0 || index >= sfn)
if(index < 0 || index >= (int)(sfn))
{
in.setstate(std::ios_base::badbit);
return false;
@ -2032,7 +2032,7 @@ read_sloop(SHalfloop_handle slh) {
slh->incident_sface() = SFace_of[index];
OK = OK && test_string(",");
in >> index;
if(index < 0 || index >= fn)
if(index < 0 || index >= (int)(fn))
{
in.setstate(std::ios_base::badbit);
return false;
@ -2083,7 +2083,7 @@ read_sface(SFace_handle sfh) {
OK = OK && test_string("{");
in >> index;
if(index < 0 || index >= vn)
if(index < 0 || index >= (int)(sln))
{
in.setstate(std::ios_base::badbit);
return false;
@ -2097,7 +2097,7 @@ read_sface(SFace_handle sfh) {
in >> index;
// sfh->boundary_entry_objects().push_back(SEdge_of[index]);
SM_decorator SD(&*sfh->center_vertex());
if(index < 0 || index >= sen)
if(index < 0 || index >= (int)(sln))
{
in.setstate(std::ios_base::badbit);
return false;
@ -2110,7 +2110,7 @@ read_sface(SFace_handle sfh) {
while(isdigit(cc)) {
in.putback(cc);
in >> index;
if(index < 0 || index >= en)
if(index < 0 || index >= (int)(sln))
{
in.setstate(std::ios_base::badbit);
return false;
@ -2124,7 +2124,7 @@ read_sface(SFace_handle sfh) {
while(isdigit(cc)) {
in.putback(cc);
in >> index;
if(index < 0 || index >= sln)
if(index < 0 || index >= (int)(sln))
{
in.setstate(std::ios_base::badbit);
return false;
@ -2135,7 +2135,7 @@ read_sface(SFace_handle sfh) {
}
in >> index;
if(index < 0 || index >= vn)
if(index < 0 || index >= (int)(sln))
{
in.setstate(std::ios_base::badbit);
return false;