summaryrefslogtreecommitdiff
path: root/oox
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 /oox
parent14cd5182c5f64c43581c82db8c958369152226ac (diff)
Silence Clang -Wimplicit-fallthrough in gperf-generated code
...in preparation of eventually enabling -Wimplicit-fallthrough for Clang. Change-Id: Idca352d011505e83dbe275cb19626c8b9d8560c8
Diffstat (limited to 'oox')
-rw-r--r--oox/source/token/tokenmap.cxx5
1 files changed, 2 insertions, 3 deletions
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() :