diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 09:46:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 13:28:16 +0100 |
| commit | ab9b67bbb001f380b3973941443bfbc59fe7141c (patch) | |
| tree | 4737847b2970d2310932f115935a9454aacff6fe /sal/rtl | |
| parent | crashtesting: doubly deleted reloadtimer (diff) | |
| download | core-ab9b67bbb001f380b3973941443bfbc59fe7141c.tar.gz core-ab9b67bbb001f380b3973941443bfbc59fe7141c.zip | |
Remove obsolete SAL_FALLTHROUGH completely
...after 7ffdd830d5fb52f2ca25aa80277d22ea6d89970b
"HAVE_CPP_ATTRIBUTE_FALLTHROUGH is always true now"
Change-Id: I54e5ff4e036a6bb3e5774d1c0524158aae18e937
Reviewed-on: https://gerrit.libreoffice.org/64800
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sal/rtl')
| -rw-r--r-- | sal/rtl/cipher.cxx | 28 | ||||
| -rw-r--r-- | sal/rtl/digest.cxx | 12 | ||||
| -rw-r--r-- | sal/rtl/uri.cxx | 4 |
3 files changed, 22 insertions, 22 deletions
diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx index 70a26cd3fe62..5077119babe9 100644 --- a/sal/rtl/cipher.cxx +++ b/sal/rtl/cipher.cxx @@ -51,19 +51,19 @@ switch ((n)) \ { \ case 8: (xr) = (static_cast<sal_uInt32>(*(--(c)))); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 7: (xr) |= (static_cast<sal_uInt32>(*(--(c)))) << 8; \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 6: (xr) |= (static_cast<sal_uInt32>(*(--(c)))) << 16; \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 5: (xr) |= (static_cast<sal_uInt32>(*(--(c)))) << 24; \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 4: (xl) = (static_cast<sal_uInt32>(*(--(c)))); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 3: (xl) |= (static_cast<sal_uInt32>(*(--(c)))) << 8; \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 2: (xl) |= (static_cast<sal_uInt32>(*(--(c)))) << 16; \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 1: (xl) |= (static_cast<sal_uInt32>(*(--(c)))) << 24; \ } \ } @@ -74,19 +74,19 @@ switch ((n)) \ { \ case 8: *(--(c)) = static_cast<sal_uInt8>(((xr) ) & 0xff); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 7: *(--(c)) = static_cast<sal_uInt8>(((xr) >> 8) & 0xff); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 6: *(--(c)) = static_cast<sal_uInt8>(((xr) >> 16) & 0xff); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 5: *(--(c)) = static_cast<sal_uInt8>(((xr) >> 24) & 0xff); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 4: *(--(c)) = static_cast<sal_uInt8>(((xl) ) & 0xff); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 3: *(--(c)) = static_cast<sal_uInt8>(((xl) >> 8) & 0xff); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 2: *(--(c)) = static_cast<sal_uInt8>(((xl) >> 16) & 0xff); \ - SAL_FALLTHROUGH; \ + [[fallthrough]]; \ case 1: *(--(c)) = static_cast<sal_uInt8>(((xl) >> 24) & 0xff); \ } \ } diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx index 3ec357a2cb34..1000fc0aed02 100644 --- a/sal/rtl/digest.cxx +++ b/sal/rtl/digest.cxx @@ -613,11 +613,11 @@ static void endMD5(DigestContextMD5 *ctx) switch (ctx->m_nDatLen & 0x03) { case 0: X[i] = static_cast<sal_uInt32>(*(p++)) << 0; - SAL_FALLTHROUGH; + [[fallthrough]]; case 1: X[i] |= static_cast<sal_uInt32>(*(p++)) << 8; - SAL_FALLTHROUGH; + [[fallthrough]]; case 2: X[i] |= static_cast<sal_uInt32>(*(p++)) << 16; - SAL_FALLTHROUGH; + [[fallthrough]]; case 3: X[i] |= static_cast<sal_uInt32>(*p) << 24; } @@ -1034,11 +1034,11 @@ static void endSHA(DigestContextSHA *ctx) switch (ctx->m_nDatLen & 0x03) { case 0: X[i] = static_cast<sal_uInt32>(*(p++)) << 0; - SAL_FALLTHROUGH; + [[fallthrough]]; case 1: X[i] |= static_cast<sal_uInt32>(*(p++)) << 8; - SAL_FALLTHROUGH; + [[fallthrough]]; case 2: X[i] |= static_cast<sal_uInt32>(*(p++)) << 16; - SAL_FALLTHROUGH; + [[fallthrough]]; case 3: X[i] |= static_cast<sal_uInt32>(*(p++)) << 24; } diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx index 3bf0e1d34c2f..baa806928238 100644 --- a/sal/rtl/uri.cxx +++ b/sal/rtl/uri.cxx @@ -704,7 +704,7 @@ void SAL_CALL rtl_uriDecode(rtl_uString * pText, case rtl_UriDecodeToIuri: eCharset = RTL_TEXTENCODING_UTF8; - SAL_FALLTHROUGH; + [[fallthrough]]; default: // rtl_UriDecodeWithCharset, rtl_UriDecodeStrict { sal_Unicode const * p = pText->buffer; @@ -724,7 +724,7 @@ void SAL_CALL rtl_uriDecode(rtl_uString * pText, writeEscapeOctet(pResult, &nCapacity, nUtf32); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case EscapeNo: writeUcs4(pResult, &nCapacity, nUtf32); |