diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-02-09 09:32:06 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-02-09 14:13:06 +0100 |
| commit | 7749e10198dc1ca49f39955a706209da65a818c4 (patch) | |
| tree | b7d77f1873241d40574d4f01b2e6470ae4d63558 | |
| parent | 5f5f0937544e135891a008273eb7a44aac7f0c5b (diff) | |
...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@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | sw/source/filter/xml/xmltbli.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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 |