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 --- cppuhelper/source/servicemanager.cxx | 6 +++--- cppuhelper/source/typemanager.cxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cppuhelper') diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index a9c06fa1bce9..d38e636d2fa9 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -188,7 +188,7 @@ Parser::Parser( state = STATE_COMPONENTS; break; } - SAL_FALLTHROUGH; + [[fallthrough]]; case STATE_COMPONENT_INITIAL: if (res == xmlreader::XmlReader::Result::Begin && nsId == ucNsId && name.equals(RTL_CONSTASCII_STRINGPARAM("implementation"))) @@ -1341,7 +1341,7 @@ void cppuhelper::ServiceManager::readRdbDirectory( SAL_INFO("cppuhelper", "Ignored optional " << uri); return; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: throw css::uno::DeploymentException( "Cannot open directory " + uri, @@ -1403,7 +1403,7 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(OUString const & uri) { } } } - SAL_FALLTHROUGH; + [[fallthrough]]; default: return false; } diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx index 15702e624e59..a3153b7d6606 100644 --- a/cppuhelper/source/typemanager.cxx +++ b/cppuhelper/source/typemanager.cxx @@ -2035,7 +2035,7 @@ void cppuhelper::TypeManager::readRdbDirectory( SAL_INFO("cppuhelper", "Ignored optional " << uri); return; } - SAL_FALLTHROUGH; + [[fallthrough]]; default: throw css::uno::DeploymentException( "Cannot open directory " + uri, -- cgit