diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
| commit | 14cd5182c5f64c43581c82db8c958369152226ac (patch) | |
| tree | 57f150ba2707f29214eeb9b1eaad2373780d1b15 /ucb | |
| parent | e4bb2b4f4875c15bd68297b5be716edd6859841e (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.
Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/core/ucbcmds.cxx | 6 | ||||
| -rw-r--r-- | ucb/source/inc/regexpmap.hxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/webdavcontent.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index 9a9db759069a..843cae6009f7 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -1403,7 +1403,7 @@ void globalTransfer_( rContext.xProcessor, rContext.aArg.NameClash ) ), rContext.xOrigEnv ); - // Unreachable + SAL_FALLTHROUGH; // Unreachable } case ucb::NameClash::ERROR: @@ -1437,7 +1437,7 @@ void globalTransfer_( case NOT_HANDLED: // Not handled. cppu::throwException( aExc ); - // break; + SAL_FALLTHROUGH; // break; case UNKNOWN: // Handled, but not clear, how... @@ -1810,7 +1810,7 @@ void UniversalContentBroker::globalTransfer( case NOT_HANDLED: // Not handled. cppu::throwException( aExc ); -// break; + SAL_FALLTHROUGH; // break; case UNKNOWN: // Handled, but not clear, how... diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx index 994d896b875c..49265e5332ab 100644 --- a/ucb/source/inc/regexpmap.hxx +++ b/ucb/source/inc/regexpmap.hxx @@ -220,13 +220,13 @@ void RegexpMapIterImpl< Val >::next() case Regexp::KIND_DOMAIN: if (m_aIndex == m_pMap->m_aList[m_nList].end()) return; - //fall-through + SAL_FALLTHROUGH; default: ++m_aIndex; if (m_nList == Regexp::KIND_DOMAIN || m_aIndex != m_pMap->m_aList[m_nList].end()) break; - //fall-through + SAL_FALLTHROUGH; case -1: do { diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index e3c1decc962e..f89a2fc9bde8 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -2685,7 +2685,7 @@ void Content::transfer( task::InteractionClassification_ERROR, aTargetURI ) ), Environment ); - // Unreachable + SAL_FALLTHROUGH; // Unreachable } case ucb::NameClash::OVERWRITE: |