sw/source/core/swg/SwXMLBlockImport.cxx | 12 ++++++++++++
1 file changed, 12 insertions(+)
New commits:
commit 5f0f3d4e91e9eb1d1f60b0cd073e7bbd8ea38c29
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Dec 4 11:23:01 2014 +0100
Work around -Werror,-Wdeprecated-register
Change-Id: I501bda18e33939c0becc13dcdf27cd96e33d7331
diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx
b/sw/source/core/swg/SwXMLBlockImport.cxx
index 5491aa2..dcc6909 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
