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 /binaryurp | |
| 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 'binaryurp')
| -rw-r--r-- | binaryurp/source/incomingrequest.cxx | 2 | ||||
| -rw-r--r-- | binaryurp/source/marshal.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx index 009e473c64b4..2413b6894f6f 100644 --- a/binaryurp/source/incomingrequest.cxx +++ b/binaryurp/source/incomingrequest.cxx @@ -171,7 +171,7 @@ bool IncomingRequest::execute_throw( } break; } - // fall through + SAL_FALLTHROUGH; default: { OSL_ASSERT(object_.is()); diff --git a/binaryurp/source/marshal.cxx b/binaryurp/source/marshal.cxx index a45d1c639d0c..b2251e9ca6a8 100644 --- a/binaryurp/source/marshal.cxx +++ b/binaryurp/source/marshal.cxx @@ -194,7 +194,7 @@ void Marshal::writeValue( break; case typelib_TypeClass_BOOLEAN: assert(*static_cast< sal_uInt8 const * >(value) <= 1); - // fall through + SAL_FALLTHROUGH; case typelib_TypeClass_BYTE: write8(buffer, *static_cast< sal_uInt8 const * >(value)); break; |