From ab3eabe438880d6c0fc7dab99a8537d873da3f05 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 12 May 2020 15:34:33 +0200 Subject: gcc 10 also generates this clobber warning (specifically 10.1.1 is the version I have) Change-Id: I40fd720a9a75b809f24ca135c4ddb0ce61ecbe41 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94056 Tested-by: Jenkins Reviewed-by: Noel Grandin --- jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'jvmfwk') diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 4760ab629313..c754dbe7c9cb 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -818,12 +818,12 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( #endif return errorcode; -#if defined __GNUC__ && __GNUC__ == 7 && !defined __clang__ +#if defined __GNUC__ && (__GNUC__ == 7 || __GNUC__ == 10) && !defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wclobbered" #endif } -#if defined __GNUC__ && __GNUC__ == 7 && !defined __clang__ +#if defined __GNUC__ && (__GNUC__ == 7 || __GNUC__ == 10) && !defined __clang__ #pragma GCC diagnostic pop #endif -- cgit