Commit 87f9391a authored by Chris Cantwell's avatar Chris Cantwell

Merge branch 'fix/gcc-fallthrough' into 'master'

fixing fallthrouh for gcc and making it homogeneous

See merge request !1086
parents d02fe2a8 97fe50e0
......@@ -91,6 +91,7 @@ v5.0.0
- Remove use of `using namespace std` in header files (!1066)
- Add error messages for use of ARPACK in serial (!1079)
- Generalise ContainsPoint routine (!1078)
- Homogenized fallthrough to fix issues with gcc 7.4.0 (!1084)
**NekMesh**:
- Add feature to read basic 2D geo files as CAD (!731)
......
......@@ -118,7 +118,7 @@ namespace LibUtilities
{
case 1:
compressedDataString += '\0';
BOOST_FALLTHROUGH;
/* Falls through. */
case 2:
compressedDataString += '\0';
break;
......
......@@ -183,7 +183,7 @@ namespace LibUtilities
switch (ret) {
case Z_NEED_DICT:
ret = Z_DATA_ERROR;
BOOST_FALLTHROUGH; /* and fall through */
/* Falls through. */
case Z_DATA_ERROR:
case Z_MEM_ERROR:
(void)inflateEnd(&strm);
......
......@@ -751,8 +751,8 @@ namespace Nektar
int StdHexExp::v_GetTotalEdgeIntNcoeffs() const
{
return 4*(GetBasisNumModes(0)+GetBasisNumModes(1)+GetBasisNumModes(2));
}
return 4*(GetBasisNumModes(0)+GetBasisNumModes(1)+GetBasisNumModes(2));
}
int StdHexExp::v_GetFaceNcoeffs(const int i) const
......@@ -793,10 +793,10 @@ namespace Nektar
int StdHexExp::v_GetTotalFaceIntNcoeffs() const
{
return 2*((GetBasisNumModes(0)-2)*(GetBasisNumModes(1)-2)+
(GetBasisNumModes(0)-2)*(GetBasisNumModes(2)-2)+
(GetBasisNumModes(1)-2)*(GetBasisNumModes(2)-2));
}
return 2*((GetBasisNumModes(0)-2)*(GetBasisNumModes(1)-2)+
(GetBasisNumModes(0)-2)*(GetBasisNumModes(2)-2)+
(GetBasisNumModes(1)-2)*(GetBasisNumModes(2)-2));
}
int StdHexExp::v_GetFaceNumPoints(const int i) const
{
......@@ -1077,8 +1077,8 @@ namespace Nektar
offset = (nummodes2-1)*nummodes0*nummodes1;
jump1 = nummodes0;
}
BOOST_FALLTHROUGH;
}
/* Falls through. */
case 0:
{
jump1 = nummodes0;
......@@ -1095,8 +1095,8 @@ namespace Nektar
offset = nummodes0*(nummodes1-1);
jump1 = nummodes0*nummodes1;
}
BOOST_FALLTHROUGH;
}
/* Falls through. */
case 1:
{
jump1 = nummodes0*nummodes1;
......@@ -1115,8 +1115,8 @@ namespace Nektar
jump2 = nummodes0;
}
BOOST_FALLTHROUGH;
}
/* Falls through. */
case 4:
{
jump1 = nummodes0*nummodes1;
......
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