summaryrefslogtreecommitdiffstats
path: root/vcl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-05-10 16:53:52 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-05-10 16:53:52 +0200
commitd2cc57bf4286773260261e1c82315ef8b3a174e5 (patch)
tree622b299cf972c5c5388dd6851fee2b170d5cdb03 /vcl
parentReplace fallthrough comments with new SAL_FALLTHROUGH macro (diff)
downloadcore-d2cc57bf4286773260261e1c82315ef8b3a174e5.tar.gz
core-d2cc57bf4286773260261e1c82315ef8b3a174e5.zip
Silence Clang -Wimplicit-fallthrough in gperf-generated code
...in preparation of eventually enabling -Wimplicit-fallthrough for Clang. Change-Id: Idca352d011505e83dbe275cb19626c8b9d8560c8
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/generic/fontmanager/parseAFM.cxx5
1 files changed, 2 insertions, 3 deletions
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)
{