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 /cppuhelper | |
| parent | 3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b (diff) | |
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 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/servicemanager.cxx | 6 | ||||
| -rw-r--r-- | cppuhelper/source/typemanager.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
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, |