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

[Stephan Bergmann]

 sw/source/filter/xml/xmltbli.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bc2ae79f81c8aa081d6340348c70c0440f6e895e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 2 16:37:51 2018 +0100

    There appears to be broken GCC out there
    
    At least some "gcc (Ubuntu 5.4.0-6ubuntu1~16.04.8) 5.4.0 20160609", even with
    -std=gnu++17, reportedly does not treat the in-class declaration of MAX_WIDTH
    as a definition, and needs this old-style out-of-class definition, too.
    
    Change-Id: I7760241f526802751b6a2f1b9698f9f2d1cd51c0
    Reviewed-on: https://gerrit.libreoffice.org/49156
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Lera Goncharuk <lera.goncharuk at gmail.com>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 61b629673256..068080373199 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1228,7 +1228,7 @@ public:
     }
 };
 
-#if __cplusplus <= 201402
+#if __cplusplus <= 201402 || (defined __GNUC__ && __GNUC__ == 5 && __GNUC_MINOR__ <= 4)
 constexpr sal_Int32 SwXMLTableContext::MAX_WIDTH;
 #endif