mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work around GCC 7 -Werror=implicit-fallthrough=

Browse Source 
This is in !LIBO_INTERNAL_ONLY code, so cannot use SAL_FALLTHROUGH.  And even on
current <https://github.com/boostorg/config> master, BOOST_FALLTHROUGH does not
yet support [[fallthrough]] for GCC 7.

Change-Id: I5306c3949b13c517fe8ef643cf98c2021147617e
This commit is contained in:
Stephan Bergmann
2017-01-31 10:55:16 +01:00
parent f669813835
commit ccb1b1251c
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysqlc/source/mysqlc_preparedstatement.cxx
View File

@@ -490,7 +490,11 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 _parameterIndex, c
setDouble( _parameterIndex, nValue ); setDouble( _parameterIndex, nValue );
break; break;
} }
#if defined __GNUC__ && __GNUC__ >= 7
[[fallthrough]];
#else
BOOST_FALLTHROUGH; BOOST_FALLTHROUGH;
#endif
} }
case DataType::CHAR: case DataType::CHAR:
@@ -517,7 +521,11 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 _parameterIndex, c
setFloat(_parameterIndex,nValue); setFloat(_parameterIndex,nValue);
break; break;
} }
#if defined __GNUC__ && __GNUC__ >= 7
[[fallthrough]];
#else
BOOST_FALLTHROUGH; BOOST_FALLTHROUGH;
#endif
} }
case DataType::DOUBLE: case DataType::DOUBLE: