summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-07-08 12:16:12 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-07-08 17:32:25 +0200
commit9e31cf2ae6b085259e664fa90f052b09815b4c18 (patch)
treeb510359722e96103a52abde21d06fdf9ca2487f9 /oox
parentbebfef0110a2776326d6e9293ef06b5bd56452ae (diff)
-Werror,-Wdeprecated-register (Clang trunk towards 3.4)
...in files generated by gperf; an alternative could be to use -isystem instead of -I in gb_Library_use_custom_headers. Change-Id: I316684ab5342977655a5642903b13e127adaf95c
Diffstat (limited to 'oox')
-rw-r--r--oox/source/token/tokenmap.cxx11
1 files changed, 11 insertions, 0 deletions
diff --git a/oox/source/token/tokenmap.cxx b/oox/source/token/tokenmap.cxx
index bd2657ce007b..5460b7c959eb 100644
--- a/oox/source/token/tokenmap.cxx
+++ b/oox/source/token/tokenmap.cxx
@@ -32,7 +32,18 @@ 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 "-Wdeprecated-register"
+#endif
+#endif
#include "tokenhash.inc"
+#if defined __clang__
+#if __has_warning("-Wdeprecated-register")
+#pragma GCC diagnostic pop
+#endif
+#endif
} // namespace
// ============================================================================