diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:53:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:53:52 +0200 |
| commit | d2cc57bf4286773260261e1c82315ef8b3a174e5 (patch) | |
| tree | 622b299cf972c5c5388dd6851fee2b170d5cdb03 | |
| parent | 14cd5182c5f64c43581c82db8c958369152226ac (diff) | |
Silence Clang -Wimplicit-fallthrough in gperf-generated code
...in preparation of eventually enabling -Wimplicit-fallthrough for Clang.
Change-Id: Idca352d011505e83dbe275cb19626c8b9d8560c8
| -rw-r--r-- | filter/source/svg/tokenmap.cxx | 5 | ||||
| -rw-r--r-- | oox/source/token/tokenmap.cxx | 5 | ||||
| -rw-r--r-- | vcl/unx/generic/fontmanager/parseAFM.cxx | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/filter/source/svg/tokenmap.cxx b/filter/source/svg/tokenmap.cxx index 57084c85e0c9..00b7bca5df4e 100644 --- a/filter/source/svg/tokenmap.cxx +++ b/filter/source/svg/tokenmap.cxx @@ -24,17 +24,16 @@ namespace svgi { #if defined __clang__ -#if __has_warning("-Wdeprecated-register") #pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#if __has_warning("-Wdeprecated-register") #pragma GCC diagnostic ignored "-Wdeprecated-register" #endif #endif #include "tokens.cxx" #if defined __clang__ -#if __has_warning("-Wdeprecated-register") #pragma GCC diagnostic pop #endif -#endif sal_Int32 getTokenId( const char* sIdent, sal_Int32 nLen ) { diff --git a/oox/source/token/tokenmap.cxx b/oox/source/token/tokenmap.cxx index fb96c37fe3a3..549c40fec7b3 100644 --- a/oox/source/token/tokenmap.cxx +++ b/oox/source/token/tokenmap.cxx @@ -31,17 +31,16 @@ using ::com::sun::star::uno::Sequence; namespace { // include auto-generated Perfect_Hash #if defined __clang__ -#if __has_warning("-Wdeprecated-register") #pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#if __has_warning("-Wdeprecated-register") #pragma GCC diagnostic ignored "-Wdeprecated-register" #endif #endif #include "tokenhash.inc" #if defined __clang__ -#if __has_warning("-Wdeprecated-register") #pragma GCC diagnostic pop #endif -#endif } // namespace TokenMap::TokenMap() : diff --git a/vcl/unx/generic/fontmanager/parseAFM.cxx b/vcl/unx/generic/fontmanager/parseAFM.cxx index 5b83021ee5d3..d933b000a43d 100644 --- a/vcl/unx/generic/fontmanager/parseAFM.cxx +++ b/vcl/unx/generic/fontmanager/parseAFM.cxx @@ -315,17 +315,16 @@ static char *linetoken( FileInputStream* stream ) * The algorithm is a standard Knuth binary search. */ #if defined __clang__ -#if __has_warning("-Wdeprecated-register") #pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#if __has_warning("-Wdeprecated-register") #pragma GCC diagnostic ignored "-Wdeprecated-register" #endif #endif #include "afm_hash.hpp" #if defined __clang__ -#if __has_warning("-Wdeprecated-register") #pragma GCC diagnostic pop #endif -#endif static inline enum parseKey recognize( char* ident, int len) { |