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

Stephan Bergmann sbergman at redhat.com
Thu Feb 23 11:18:27 UTC 2017


 vcl/source/gdi/pdfwriter_impl.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 9d2721b1bb1256446a89ae8ab8f31f7f780d500c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 23 12:17:55 2017 +0100

    -Werror=register in external/lcms2 (GCC -std=c++17)
    
    Change-Id: Ic0c7fe636f8153f221c0bc221c547f23b0e780a2

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index fd63cdd..3fe1bf4 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -23,7 +23,15 @@
 
 #include <math.h>
 #include <algorithm>
+
+#if defined __GNUC__ && __cplusplus > 201402L
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wregister"
+#endif
 #include <lcms2.h>
+#if defined __GNUC__ && __cplusplus > 201402L
+#pragma GCC diagnostic pop
+#endif
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>


More information about the Libreoffice-commits mailing list