diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:26:06 -0400 |
| commit | e7b11300cd813f821d1ec5cb4633ce2c5f7d1b9f (patch) | |
| tree | a6c39d9d4cde1baa84a9d788affbce3508af89a8 /cppuhelper | |
| parent | 34f591ca95c4c63be092da4c4b2294230404f336 (diff) | |
Replace fallthrough comments with new SAL_FALLTHROUGH macro
...which (in LIBO_INTERNAL_ONLY) for Clang expands to [[clang::fallthrough]] in
preparation of enabling -Wimplicit-fallthrough. (This is only relevant for
C++11, as neither C nor old C++ has a way to annotate intended fallthroughs.)
Could use BOOST_FALLTHROUGH instead of introducing our own SAL_FALLTHROUGH, but
that would require adding back in dependencies on boost_headers to many
libraries where we carefully removed any remaining Boost dependencies only
recently. (At least make SAL_FALLTHROUGH strictly LIBO_INTERNAL_ONLY, so its
future evolution will not have any impact on the stable URE interface.) C++17
will have a proper [[fallthroug]], eventually removing the need for a macro
altogether.
(cherry picked from commit 14cd5182c5f64c43581c82db8c958369152226ac)
Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
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 2cdc7241e9e7..b2738a4e5e76 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -188,7 +188,7 @@ Parser::Parser( state = STATE_COMPONENTS; break; } - // fall through + SAL_FALLTHROUGH; case STATE_COMPONENT_INITIAL: if (res == xmlreader::XmlReader::RESULT_BEGIN && nsId == ucNsId && name.equals(RTL_CONSTASCII_STRINGPARAM("implementation"))) @@ -1516,7 +1516,7 @@ void cppuhelper::ServiceManager::readRdbDirectory( SAL_INFO("cppuhelper", "Ignored optional " << uri); return; } - // fall through + SAL_FALLTHROUGH; default: throw css::uno::DeploymentException( "Cannot open directory " + uri, @@ -1578,7 +1578,7 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) { } } } - // fall through + SAL_FALLTHROUGH; default: return false; } diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx index 12a88dc2006a..84e6657dbb8d 100644 --- a/cppuhelper/source/typemanager.cxx +++ b/cppuhelper/source/typemanager.cxx @@ -2123,7 +2123,7 @@ void cppuhelper::TypeManager::readRdbDirectory( SAL_INFO("cppuhelper", "Ignored optional " << uri); return; } - // fall through + SAL_FALLTHROUGH; default: throw css::uno::DeploymentException( "Cannot open directory " + uri, |