From ab9b67bbb001f380b3973941443bfbc59fe7141c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 8 Dec 2018 09:46:01 +0100 Subject: 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 --- unoidl/source/legacyprovider.cxx | 2 +- unoidl/source/sourceprovider-parser.y | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'unoidl') diff --git a/unoidl/source/legacyprovider.cxx b/unoidl/source/legacyprovider.cxx index 1cd6ffa4b0f4..5dc418196cfd 100644 --- a/unoidl/source/legacyprovider.cxx +++ b/unoidl/source/legacyprovider.cxx @@ -219,7 +219,7 @@ rtl::Reference< Entity > readEntity( if (probe) { return rtl::Reference< Entity >(); } - SAL_FALLTHROUGH; + [[fallthrough]]; default: throw FileFormatException( key.getRegistryName(), diff --git a/unoidl/source/sourceprovider-parser.y b/unoidl/source/sourceprovider-parser.y index 747437660fdc..af8d0ec193bd 100644 --- a/unoidl/source/sourceprovider-parser.y +++ b/unoidl/source/sourceprovider-parser.y @@ -334,7 +334,7 @@ Found findEntity( break; } assert(e->entity.is()); - SAL_FALLTHROUGH; + [[fallthrough]]; case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL: if (e->entity->getSort() == unoidl::Entity::SORT_TYPEDEF) { if (typedefed != nullptr) { @@ -449,7 +449,7 @@ Found findEntity( return FOUND_ERROR; } assert(e->entity.is()); - SAL_FALLTHROUGH; + [[fallthrough]]; case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL: switch (e->entity->getSort()) { case unoidl::Entity::SORT_ENUM_TYPE: @@ -679,7 +679,7 @@ Found findEntity( break; } assert(e->entity.is()); - SAL_FALLTHROUGH; + [[fallthrough]]; case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL: switch (e->entity->getSort()) { case unoidl::Entity::SORT_ENUM_TYPE: @@ -745,7 +745,7 @@ Found findEntity( return FOUND_ERROR; } assert(e->entity.is()); - SAL_FALLTHROUGH; + [[fallthrough]]; case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL: if (e->entity->getSort() == unoidl::Entity::SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE) @@ -776,7 +776,7 @@ Found findEntity( t = unoidl::detail::SourceProviderType(n, e, args); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case unoidl::detail::SourceProviderEntity::KIND_INTERFACE_DECL: case unoidl::detail::SourceProviderEntity::KIND_PUBLISHED_INTERFACE_DECL: error( @@ -1911,7 +1911,7 @@ typedefDefn: break; case unoidl::detail::SourceProviderEntity::KIND_MODULE: assert(false && "this cannot happen"); - SAL_FALLTHROUGH; + [[fallthrough]]; default: assert(t.entity->entity.is() || t.entity->pad.is()); unpub @@ -1931,7 +1931,7 @@ typedefDefn: break; case unoidl::detail::SourceProviderType::TYPE_PARAMETER: assert(false && "this cannot happen"); - SAL_FALLTHROUGH; + [[fallthrough]]; default: break; } @@ -3796,7 +3796,7 @@ type: break; } assert(ent->entity.is()); - SAL_FALLTHROUGH; + [[fallthrough]]; case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL: if (data->publishedContext && ent->entity->getSort() != unoidl::Entity::SORT_MODULE @@ -3843,7 +3843,7 @@ type: break; case unoidl::Entity::SORT_TYPEDEF: assert(false && "this cannot happen"); - SAL_FALLTHROUGH; + [[fallthrough]]; default: break; } @@ -3856,7 +3856,7 @@ type: + " used in published context")); YYERROR; } - SAL_FALLTHROUGH; + [[fallthrough]]; case unoidl::detail::SourceProviderEntity::KIND_PUBLISHED_INTERFACE_DECL: $$ = new unoidl::detail::SourceProviderType( unoidl::detail::SourceProviderType::TYPE_INTERFACE, name, @@ -3908,7 +3908,7 @@ type: break; } assert(ent->entity.is()); - SAL_FALLTHROUGH; + [[fallthrough]]; case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL: if (ent->entity->getSort() == unoidl::Entity::SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE) @@ -4428,7 +4428,7 @@ bool parse(OUString const & uri, SourceProviderScannerData * data) { break; default: assert(false); - SAL_FALLTHROUGH; + [[fallthrough]]; case 1: throw FileFormatException( uri, -- cgit