Commit 76c61df5 authored by Jan Möbius's avatar Jan Möbius

Fixed several warnings with fallthrough on gcc 8

parent 3d799d72
...@@ -464,7 +464,7 @@ int main(int argc, char* argv[]) ...@@ -464,7 +464,7 @@ int main(int argc, char* argv[])
{ {
case 'D': opt.decorate_name = true; break; case 'D': opt.decorate_name = true; break;
case 'd': gdebug = true; break; case 'd': gdebug = true; break;
case 'h': usage_and_exit(0); case 'h': usage_and_exit(0); break;
case 'i': ifname = optarg; break; case 'i': ifname = optarg; break;
case 'M': opt.parse_argument( optarg ); break; case 'M': opt.parse_argument( optarg ); break;
case 'n': opt.n_collapses = float(atof(optarg)); break; case 'n': opt.n_collapses = float(atof(optarg)); break;
......
...@@ -98,6 +98,7 @@ int main(int argc, char **argv) ...@@ -98,6 +98,7 @@ int main(int argc, char **argv)
case 's': opt += OpenMesh::IO::Options::Swap; break; case 's': opt += OpenMesh::IO::Options::Swap; break;
case 'h': case 'h':
usage_and_exit(0); usage_and_exit(0);
break;
default: default:
usage_and_exit(1); usage_and_exit(1);
} }
......
...@@ -95,6 +95,7 @@ int main(int argc, char **argv) ...@@ -95,6 +95,7 @@ int main(int argc, char **argv)
case 'b': opt += OpenMesh::IO::Options::Binary; break; case 'b': opt += OpenMesh::IO::Options::Binary; break;
case 'h': case 'h':
usage_and_exit(0); usage_and_exit(0);
break;
case 's': opt += OpenMesh::IO::Options::Swap; break; case 's': opt += OpenMesh::IO::Options::Swap; break;
default: default:
usage_and_exit(1); usage_and_exit(1);
......
...@@ -136,7 +136,7 @@ int main(int argc, char **argv) ...@@ -136,7 +136,7 @@ int main(int argc, char **argv)
: SmootherT<MyMesh>::Normal; : SmootherT<MyMesh>::Normal;
break; break;
case 'h': usage_and_exit(0); case 'h': usage_and_exit(0); break;
case '?': case '?':
default: usage_and_exit(1); default: usage_and_exit(1);
} }
......
...@@ -170,7 +170,7 @@ int main(int argc, char **argv) ...@@ -170,7 +170,7 @@ int main(int argc, char **argv)
case 'm': { std::stringstream s; s << optarg; s >> max_nv; } break; case 'm': { std::stringstream s; s << optarg; s >> max_nv; } break;
case 'r': rule_sequence = optarg; break; case 'r': rule_sequence = optarg; break;
case 'U': uniform = true; break; case 'U': uniform = true; break;
case 'h': usage_and_exit(argv[0],0); case 'h': usage_and_exit(argv[0],0); break;
case '?': case '?':
default: usage_and_exit(argv[0],1); default: usage_and_exit(argv[0],1);
} }
......
...@@ -234,7 +234,7 @@ int main(int argc, char **argv) ...@@ -234,7 +234,7 @@ int main(int argc, char **argv)
} }
break; break;
} }
case 'h': usage_and_exit(0); case 'h': usage_and_exit(0); break;
case '?': case '?':
default: usage_and_exit(1); default: usage_and_exit(1);
} }
......
...@@ -276,7 +276,7 @@ int main(int argc, char **argv) ...@@ -276,7 +276,7 @@ int main(int argc, char **argv)
{ {
case 'v': verbose = true; break; case 'v': verbose = true; break;
case 'o': ofname = optarg; break; case 'o': ofname = optarg; break;
case 'h': usage_and_exit(0); case 'h': usage_and_exit(0); break;
default: usage_and_exit(1); default: usage_and_exit(1);
} }
} }
......
...@@ -259,6 +259,7 @@ int main(int argc, char **argv) ...@@ -259,6 +259,7 @@ int main(int argc, char **argv)
case 'I': enable_modIS = true; break; case 'I': enable_modIS = true; break;
case 'h': case 'h':
usage_and_exit(0); usage_and_exit(0);
break;
default: default:
usage_and_exit(1); usage_and_exit(1);
} }
......
...@@ -183,6 +183,7 @@ int main(int argc, char *argv[] ) ...@@ -183,6 +183,7 @@ int main(int argc, char *argv[] )
case 'o': ofname = optarg; break; case 'o': ofname = optarg; break;
case 'h': case 'h':
usage_and_exit(0); usage_and_exit(0);
break;
case '?': case '?':
default: default:
usage_and_exit(1); usage_and_exit(1);
......
...@@ -285,19 +285,15 @@ TEST_F(OpenMeshConvertPolyMeshToTriangle, EdgePropertyCheckDouble) { ...@@ -285,19 +285,15 @@ TEST_F(OpenMeshConvertPolyMeshToTriangle, EdgePropertyCheckDouble) {
// Check if it is ok. // Check if it is ok.
Mesh::EdgeIter v_it = p.edges_begin(); Mesh::EdgeIter v_it = p.edges_begin();
if(p.is_boundary( (*v_it) ))
EXPECT_EQ( p.property(doubleHandle,*v_it) , 0.0 ) << "Invalid double value for vertex 0"; EXPECT_EQ( p.property(doubleHandle,*v_it) , 0.0 ) << "Invalid double value for vertex 0";
++v_it; ++v_it;
if(p.is_boundary( (*v_it) ))
EXPECT_EQ( p.property(doubleHandle,*v_it) , 1.0 ) << "Invalid double value for vertex 1"; EXPECT_EQ( p.property(doubleHandle,*v_it) , 1.0 ) << "Invalid double value for vertex 1";
++v_it; ++v_it;
if(p.is_boundary( (*v_it) ))
EXPECT_EQ( p.property(doubleHandle,*v_it) , 2.0 ) << "Invalid double value for vertex 2"; EXPECT_EQ( p.property(doubleHandle,*v_it) , 2.0 ) << "Invalid double value for vertex 2";
++v_it; ++v_it;
if(p.is_boundary( (*v_it) ))
EXPECT_EQ( p.property(doubleHandle,*v_it) , 3.0 ) << "Invalid double value for vertex 3"; EXPECT_EQ( p.property(doubleHandle,*v_it) , 3.0 ) << "Invalid double value for vertex 3";
++v_it; ++v_it;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment