[Libreoffice-commits] core.git: filter/source oox/source vcl/unx

[Stephan Bergmann]

 filter/source/svg/tokenmap.cxx           |    5 ++---
 oox/source/token/tokenmap.cxx            |    5 ++---
 vcl/unx/generic/fontmanager/parseAFM.cxx |    5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit d2cc57bf4286773260261e1c82315ef8b3a174e5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue May 10 16:53:52 2016 +0200

    Silence Clang -Wimplicit-fallthrough in gperf-generated code
    
    ...in preparation of eventually enabling -Wimplicit-fallthrough for Clang.
    
    Change-Id: Idca352d011505e83dbe275cb19626c8b9d8560c8

diff --git a/filter/source/svg/tokenmap.cxx b/filter/source/svg/tokenmap.cxx
index 57084c8..00b7bca 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 fb96c37..549c40f 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 5b83021..d933b00 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)
 {