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 /unotools | |
| 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 'unotools')
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 2 | ||||
| -rw-r--r-- | unotools/source/config/configitem.cxx | 2 | ||||
| -rw-r--r-- | unotools/source/config/securityoptions.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 42a3081efbec..a1c7e4b1c3b0 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -477,7 +477,7 @@ static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Im eErrCode = Bootstrap::INVALID_VERSION_FILE_ENTRY; break; } - // else fall through + else SAL_FALLTHROUGH; case Bootstrap::DATA_MISSING: switch (_rData.aVersionINI_.status) diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index b951ce236bf8..083e98d98322 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -608,7 +608,7 @@ static void lcl_normalizeLocalNames(Sequence< OUString >& _rNames, ConfigNameFor } } OSL_FAIL("Cannot create absolute paths: missing interface"); - // make local paths instaed + SAL_FALLTHROUGH; // make local paths instaed case CONFIG_NAME_LOCAL_PATH: { diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index d048db008bab..61d277d2a416 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -995,7 +995,7 @@ bool SvtSecurityOptions::isSecureMacroUri( // is considered safe: return true; } - // fall through + SAL_FALLTHROUGH; case INetProtocol::Slot: return referer.equalsIgnoreAsciiCase("private:user") || isTrustedLocationUri(referer); |