summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-12-04 11:23:01 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-12-04 11:23:22 +0100
commit5f0f3d4e91e9eb1d1f60b0cd073e7bbd8ea38c29 (patch)
treee52f2d3d4a6cff4faca76fdf8a617957854c1d3a /sw
parent3de1e67e06a2ca43badf55e9d4b7aa3a21ef4edc (diff)
Work around -Werror,-Wdeprecated-register
Change-Id: I501bda18e33939c0becc13dcdf27cd96e33d7331
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/swg/SwXMLBlockImport.cxx12
1 files changed, 12 insertions, 0 deletions
diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx
index 5491aa2252eb..dcc69095a5e0 100644
--- a/sw/source/core/swg/SwXMLBlockImport.cxx
+++ b/sw/source/core/swg/SwXMLBlockImport.cxx
@@ -22,7 +22,19 @@
#include <xmloff/xmlictxt.hxx>
#include <unotools/charclass.hxx>
#include <swtypes.hxx>
+
+#if defined __clang__
+#if __has_warning("-Wdeprecated-register")
+#pragma GCC diagnostic push
+#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
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;