diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-05-07 14:43:26 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-05-07 16:54:52 +0200 |
| commit | 7d1511cfd85915e7a0764eb9de4d7a4448741958 (patch) | |
| tree | bd7d2cd6b21fbc73cf0e000e182d6936252a0d63 | |
| parent | tdf#107765: Use the correct sheet index. (diff) | |
| download | core-7d1511cfd85915e7a0764eb9de4d7a4448741958.tar.gz core-7d1511cfd85915e7a0764eb9de4d7a4448741958.zip | |
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>
| -rw-r--r-- | hwpfilter/source/hstyle.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/txtnode/modeltoviewhelper.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/hwpfilter/source/hstyle.cxx b/hwpfilter/source/hstyle.cxx index 39709f9ea97f..bf4538d686db 100644 --- a/hwpfilter/source/hstyle.cxx +++ b/hwpfilter/source/hstyle.cxx @@ -68,14 +68,14 @@ void HWPStyle::SetName(int n, char const* name) if (name) { -#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 11) && !defined __clang__ +#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 12) && !defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wstringop-truncation" #endif auto const p = style[n].name; strncpy(p, name, MAXSTYLENAME); p[MAXSTYLENAME] = '\0'; // just in case, even though the array is zero-initialized -#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 11) && !defined __clang__ +#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 12) && !defined __clang__ #pragma GCC diagnostic pop #endif } 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 } |