diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-01-22 08:12:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-01-22 09:05:43 +0100 |
| commit | 58f30cf1fe401452c0297703fe08a9aa14bd55f3 (patch) | |
| tree | a3ddaf11c08e16dcbee9de2804107ffc651eebe6 /jvmfwk/plugins | |
| parent | 61c4f96d6ae6a80370774e53287edb27cbce8067 (diff) | |
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@redhat.com>
Diffstat (limited to 'jvmfwk/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
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) { |