sw/source/filter/xml/xmltbli.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7731b86a12811b6903d29e29bb867a316c94bccc
Author: Muhammet Kara <muhammet.k...@pardus.org.tr>
Date: Thu Feb 8 16:44:16 2018 +0300
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 <rayk...@gmail.com>
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
