jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit f98689833179403ac5ed3db8e1ce1db1a64fbe7e
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jan 22 08:12:50 2019 +0100
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Wed Feb 6 02:17:36 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 <sberg...@redhat.com>
(cherry picked from commit 58f30cf1fe401452c0297703fe08a9aa14bd55f3)
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index ab51add16edb..b55fc1d7065a 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -848,7 +848,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)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
