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 /bridges | |
| 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 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 3 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 3 | ||||
| -rw-r--r-- | bridges/source/jni_uno/jni_data.cxx | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx index 44e773bc7cc5..c30249d08af7 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx @@ -364,7 +364,8 @@ typelib_TypeClass cpp_vtable_call( } TYPELIB_DANGER_RELEASE( pTD ); } - } // else perform queryInterface() + SAL_FALLTHROUGH; // else perform queryInterface() + } default: { typelib_InterfaceMethodTypeDescription *pMethodTD = diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx index 3a99aa9c71f4..647d3ec38b09 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx @@ -424,7 +424,8 @@ void unoInterfaceProxyDispatch( } TYPELIB_DANGER_RELEASE( pTD ); } - } // else perform queryInterface() + SAL_FALLTHROUGH; // else perform queryInterface() + } default: // dependent dispatch cpp_call( diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx index f6b2db2b3028..44f1efbe0431 100644 --- a/bridges/source/jni_uno/jni_data.cxx +++ b/bridges/source/jni_uno/jni_data.cxx @@ -1738,7 +1738,7 @@ void Bridge::map_to_java( jni.ensure_no_exception(); break; } - // fall through + SAL_FALLTHROUGH; } default: { |