[Libreoffice-commits] core.git: hwpfilter/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Wed Apr 29 19:33:17 UTC 2020


 hwpfilter/source/hstyle.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a6729be5e8a71933067c655a97f7a755ccb618c0
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Nov 29 11:48:56 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Apr 29 21:32:42 2020 +0200

    GCC trunk towards GCC 10 still emits a bogus -Wstringop-truncation
    
    Change-Id: I86e7bf7615bd31ed90b067cebfbaf0126c8d8c2b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84055
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/hwpfilter/source/hstyle.cxx b/hwpfilter/source/hstyle.cxx
index e6f1e3999e07..95f3570d25fd 100644
--- a/hwpfilter/source/hstyle.cxx
+++ b/hwpfilter/source/hstyle.cxx
@@ -72,14 +72,14 @@ void HWPStyle::SetName(int n, char const *name)
 
     if (name)
     {
-#if defined __GNUC__ && (__GNUC__ == 8 || __GNUC__ == 9) && !defined __clang__
+#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 10) && !defined __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wstringop-truncation"
 #endif
         auto const p = DATA[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__ == 9) && !defined __clang__
+#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 10) && !defined __clang__
 #pragma GCC diagnostic pop
 #endif
     }


More information about the Libreoffice-commits mailing list