[Libreoffice-commits] core.git: editeng/source

Tor Lillqvist tml at collabora.com
Tue Nov 11 02:31:36 PST 2014


 editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit 2640e8d34384761333a59560bb5d946d40d2b492
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Nov 11 12:29:32 2014 +0200

    WaE: 'register' storage class specifier is deprecated
    
    Silly gperf generates 'register' storage class specifiers. So ignore
    those warnings from the generated tokens.cxx file.
    
    Change-Id: Ia80139f904f949bd2ae0267b6790d17b7f0e93d0

diff --git a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx
index f669291..cafd5c0 100644
--- a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx
@@ -10,7 +10,18 @@
 #include <SvXMLAutoCorrectTokenHandler.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/xml/sax/FastToken.hpp>
+#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 ::css::uno;
 using namespace ::xmloff::token;


More information about the Libreoffice-commits mailing list