[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 7749e10198dc1ca49f39955a706209da65a818c4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 9 09:32:06 2018 +0100

    ...and Clang is not affected at all
    
    (It wouldn't really hurt to have the line enabled for more toolchains than
    necessary, as redeclaration of static constexpr data members outside the class
    is still supported for backwards-compatibility in C++17, though deprecated.
    However, recording a precise upper bound on toolchains in the #if allows to
    eventually get rid of this code, once we no longer support any affected
    toolchain.)
    
    Change-Id: I40ae37e7006754cc89538d5c97230200a2ca633c
    Reviewed-on: https://gerrit.libreoffice.org/49472
    Tested-by: Jenkins <ci at libreoffice.org>
    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 5159cc92b6dd..c7997b0fb16e 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1228,7 +1228,7 @@ public:
     }
 };
 
-#if __cplusplus <= 201402 || (defined __GNUC__ && __GNUC__ <= 6)
+#if __cplusplus <= 201402 || (defined __GNUC__ && __GNUC__ <= 6 && !defined __clang__)
 constexpr sal_Int32 SwXMLTableContext::MAX_WIDTH;
 #endif