summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolan.mcnamara@collabora.com>2023-06-01 15:48:30 +0100
committerCaolán McNamara <caolan.mcnamara@collabora.com>2023-06-02 16:07:06 +0200
commit07c61babca24ef83f94172225f597f39c5f6c462 (patch)
tree50a30e1e12debd306b376b73dd680cae5579605b
parent27800d75517957f3c372e281efd4b4c04f8b6751 (diff)
WaE: -Wmaybe-uninitialized with GCC 13
Change-Id: I69e0f28ab6f6a8a2c7181876735b128d39394b52 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152503 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 9ff2b61876843584d6c4fb3cadda48089b8a84b7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152530
-rw-r--r--sw/source/core/layout/flowfrm.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index c3690e2984cc..b499257bb001 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2000,7 +2000,15 @@ bool SwFlowFrame::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways )
}
}
+// prevent -Werror=maybe-uninitialized under gcc 11.2.0
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 13
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
std::optional<SwFrameDeleteGuard> oDeleteGuard;
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 13
+#pragma GCC diagnostic pop
+#endif
if (bMakePage)
oDeleteGuard.emplace(pOldBoss);