summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammet Kara <muhammet.kara@pardus.org.tr>2018-02-08 16:44:16 +0300
committerStephan Bergmann <sbergman@redhat.com>2018-02-09 08:54:39 +0100
commit7731b86a12811b6903d29e29bb867a316c94bccc (patch)
tree1aab4584a2a4fe2d1de606dac53b494fb66793b8
parent552bebc85d907748dcd72b7978a00a3eee7c4f34 (diff)
Workaround for broken GCC
There appears to be broken GCC out there, at least some "gcc (Debian 6.3.0-18) 6.3.0 20170516", 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. See also bc2ae79f81c8aa081d6340348c70c0440f6e895e Change-Id: Iaeb85e244d5963c01a86806f481c9d667b1f26a1 Reviewed-on: https://gerrit.libreoffice.org/49431 Reviewed-by: Jim Raykowski <raykowj@gmail.com> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--sw/source/filter/xml/xmltbli.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 068080373199..5159cc92b6dd 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__ == 5 && __GNUC_MINOR__ <= 4)
+#if __cplusplus <= 201402 || (defined __GNUC__ && __GNUC__ <= 6)
constexpr sal_Int32 SwXMLTableContext::MAX_WIDTH;
#endif