fight warnings, c++17. additional corrections++

[modules/smesh.git] / src / SMDS / SMDS_VolumeTool.cxx

diff --git a/src/SMDS/SMDS_VolumeTool.cxx b/src/SMDS/SMDS_VolumeTool.cxx
index 14c1fbddc74f6f102dd2e24c7503f2b3a1be68e3..be3370ae05461308e7fd06dc5136d934f63cbc42 100644 (file)
--- a/src/SMDS/SMDS_VolumeTool.cxx
+++ b/src/SMDS/SMDS_VolumeTool.cxx
@@ -1488,10 +1488,10 @@ bool SMDS_VolumeTool::IsLinked (const int theNode1Index,
   case QUAD_TETRA:
     {
       switch ( minInd ) {
-      case 0: if( maxInd==4 ||  maxInd==6 ||  maxInd==7 ) return true;
-      case 1: if( maxInd==4 ||  maxInd==5 ||  maxInd==8 ) return true;
-      case 2: if( maxInd==5 ||  maxInd==6 ||  maxInd==9 ) return true;
-      case 3: if( maxInd==7 ||  maxInd==8 ||  maxInd==9 ) return true;
+      case 0: if( maxInd==4 ||  maxInd==6 ||  maxInd==7 ) return true; // fall through
+      case 1: if( maxInd==4 ||  maxInd==5 ||  maxInd==8 ) return true; // fall through
+      case 2: if( maxInd==5 ||  maxInd==6 ||  maxInd==9 ) return true; // fall through
+      case 3: if( maxInd==7 ||  maxInd==8 ||  maxInd==9 ) return true; // fall through
       default:;
       }
       break;
@@ -1499,14 +1499,14 @@ bool SMDS_VolumeTool::IsLinked (const int theNode1Index,
   case QUAD_HEXA:
     {
       switch ( minInd ) {
-      case 0: if( maxInd==8 ||  maxInd==11 ||  maxInd==16 ) return true;
-      case 1: if( maxInd==8 ||  maxInd==9 ||  maxInd==17 ) return true;
-      case 2: if( maxInd==9 ||  maxInd==10 ||  maxInd==18 ) return true;
-      case 3: if( maxInd==10 ||  maxInd==11 ||  maxInd==19 ) return true;
-      case 4: if( maxInd==12 ||  maxInd==15 ||  maxInd==16 ) return true;
-      case 5: if( maxInd==12 ||  maxInd==13 ||  maxInd==17 ) return true;
-      case 6: if( maxInd==13 ||  maxInd==14 ||  maxInd==18 ) return true;
-      case 7: if( maxInd==14 ||  maxInd==15 ||  maxInd==19 ) return true;
+      case 0: if( maxInd==8  ||  maxInd==11 ||  maxInd==16 ) return true; // fall through
+      case 1: if( maxInd==8  ||  maxInd==9  ||  maxInd==17 ) return true; // fall through
+      case 2: if( maxInd==9  ||  maxInd==10 ||  maxInd==18 ) return true; // fall through
+      case 3: if( maxInd==10 ||  maxInd==11 ||  maxInd==19 ) return true; // fall through
+      case 4: if( maxInd==12 ||  maxInd==15 ||  maxInd==16 ) return true; // fall through
+      case 5: if( maxInd==12 ||  maxInd==13 ||  maxInd==17 ) return true; // fall through
+      case 6: if( maxInd==13 ||  maxInd==14 ||  maxInd==18 ) return true; // fall through
+      case 7: if( maxInd==14 ||  maxInd==15 ||  maxInd==19 ) return true; // fall through
       default:;
       }
       break;
@@ -1514,10 +1514,10 @@ bool SMDS_VolumeTool::IsLinked (const int theNode1Index,
   case QUAD_PYRAM:
     {
       switch ( minInd ) {
-      case 0: if( maxInd==5 ||  maxInd==8 ||  maxInd==9 ) return true;
-      case 1: if( maxInd==5 ||  maxInd==6 ||  maxInd==10 ) return true;
-      case 2: if( maxInd==6 ||  maxInd==7 ||  maxInd==11 ) return true;
-      case 3: if( maxInd==7 ||  maxInd==8 ||  maxInd==12 ) return true;
+      case 0: if( maxInd==5 ||  maxInd==8  ||  maxInd==9  ) return true; // fall through
+      case 1: if( maxInd==5 ||  maxInd==6  ||  maxInd==10 ) return true; // fall through
+      case 2: if( maxInd==6 ||  maxInd==7  ||  maxInd==11 ) return true; // fall through
+      case 3: if( maxInd==7 ||  maxInd==8  ||  maxInd==12 ) return true; // fall through
       case 4: if( maxInd==9 ||  maxInd==10 ||  maxInd==11 ||  maxInd==12 ) return true;
       default:;
       }
@@ -1526,12 +1526,12 @@ bool SMDS_VolumeTool::IsLinked (const int theNode1Index,
   case QUAD_PENTA:
     {
       switch ( minInd ) {
-      case 0: if( maxInd==6 ||  maxInd==8 ||  maxInd==12 ) return true;
-      case 1: if( maxInd==6 ||  maxInd==7 ||  maxInd==13 ) return true;
-      case 2: if( maxInd==7 ||  maxInd==8 ||  maxInd==14 ) return true;
-      case 3: if( maxInd==9 ||  maxInd==11 ||  maxInd==12 ) return true;
-      case 4: if( maxInd==9 ||  maxInd==10 ||  maxInd==13 ) return true;
-      case 5: if( maxInd==10 ||  maxInd==11 ||  maxInd==14 ) return true;
+      case 0: if( maxInd==6  ||  maxInd==8  ||  maxInd==12 ) return true; // fall through
+      case 1: if( maxInd==6  ||  maxInd==7  ||  maxInd==13 ) return true; // fall through
+      case 2: if( maxInd==7  ||  maxInd==8  ||  maxInd==14 ) return true; // fall through
+      case 3: if( maxInd==9  ||  maxInd==11 ||  maxInd==12 ) return true; // fall through
+      case 4: if( maxInd==9  ||  maxInd==10 ||  maxInd==13 ) return true; // fall through
+      case 5: if( maxInd==10 ||  maxInd==11 ||  maxInd==14 ) return true; // fall through
       default:;
       }
       break;