[Libreoffice-commits] core.git: jvmfwk/plugins
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Jan 22 08:06:04 UTC 2019
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit 58f30cf1fe401452c0297703fe08a9aa14bd55f3
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jan 22 08:12:50 2019 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Jan 22 09:05:43 2019 +0100
Silence bogus -Werror=clobbered (GCC 7 --enable-optimized)
> In file included from gcc/include/c++/7.1.1/vector:69:0,
> from jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx:39:
> gcc/include/c++/7.1.1/bits/vector.tcc: In function ‘javaPluginError jfw_plugin_startJavaVirtualMachine(const JavaInfo*, const JavaVMOption*, sal_Int32, JavaVM**, JNIEnv**)’:
> gcc/include/c++/7.1.1/bits/vector.tcc:407:15: error: variable ‘__new_finish’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]
> pointer __new_finish(__new_start);
> ^~~~~~~~~~~~
Change-Id: Iefabac65871ed79bcfa333f0193fcbbd1369f7f1
Reviewed-on: https://gerrit.libreoffice.org/66714
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index c6f8eeb6a5c8..f1b0ee485480 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -849,7 +849,14 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
#endif
return errorcode;
+#if defined __GNUC__ && __GNUC__ == 7 && !defined __clang__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wclobbered"
+#endif
}
+#if defined __GNUC__ && __GNUC__ == 7 && !defined __clang__
+#pragma GCC diagnostic pop
+#endif
javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, bool *exist)
{
More information about the Libreoffice-commits
mailing list