summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2022-05-07 14:43:26 +0200
committerStephan Bergmann <sbergman@redhat.com>2022-05-07 16:54:52 +0200
commit7d1511cfd85915e7a0764eb9de4d7a4448741958 (patch)
treebd7d2cd6b21fbc73cf0e000e182d6936252a0d63 /sw
parentce911276b87b86b58c45ac4b7e9f5226a7ef95c5 (diff)
GCC 12 is still just as broken
Change-Id: Ic2e151eb78512388150492b6dff0c39046d4d3c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133979 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/txtnode/modeltoviewhelper.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx b/sw/source/core/txtnode/modeltoviewhelper.cxx
index fa9b8f790860..c7b67a043b9e 100644
--- a/sw/source/core/txtnode/modeltoviewhelper.cxx
+++ b/sw/source/core/txtnode/modeltoviewhelper.cxx
@@ -179,14 +179,14 @@ ModelToViewHelper::ModelToViewHelper(const SwTextNode &rNode,
[](auto const& it) { return it.second; }))
{
// prevent -Werror=maybe-uninitialized under gcc 11.2.0
-#if defined __GNUC__ && !defined __clang_ && __GNUC__ == 11
+#if defined __GNUC__ && !defined __clang_ && __GNUC__ >= 11 && __GNUC__ <= 12
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
// i is still hidden but the Range end is oddly "-1"
aHiddenMulti.Select({*oStartHidden, i}, true);
oStartHidden.reset();
-#if defined __GNUC__ && !defined __clang_ && __GNUC__ == 11
+#if defined __GNUC__ && !defined __clang_ && __GNUC__ >= 11 && __GNUC__ <= 12
#pragma GCC diagnostic pop
#endif
}