jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 7 +++++++ readlicense_oo/README | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
New commits: commit 6c92723ed891d1e6a4693ba2c39fd926a1166363 Author: Stephan Bergmann <[email protected]> AuthorDate: Tue Jan 22 08:12:50 2019 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Sep 19 13:14:14 2019 +0200 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 <[email protected]> (cherry picked from commit 58f30cf1fe401452c0297703fe08a9aa14bd55f3) diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 117fe2c4f581..caec8633b9db 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -818,7 +818,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) { commit bb27bc4468d7f1fa679e5c0fcb56c8efb854fd3e Author: Andrea Gelmini <[email protected]> AuthorDate: Tue Mar 19 22:39:29 2019 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Sep 19 13:13:18 2019 +0200 Fix typo Change-Id: Icdd2584e03e93f5e3a93e892fc9bcf107b5dbca7 Reviewed-on: https://gerrit.libreoffice.org/69448 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> diff --git a/readlicense_oo/README b/readlicense_oo/README index cd73b2040285..eb6c4482df15 100644 --- a/readlicense_oo/README +++ b/readlicense_oo/README @@ -4,7 +4,7 @@ directory, and also potentially at run-time. Generating licence files ------------------------ -License files are generated from a single source file (licese/license.xml). +License files are generated from a single source file (license/license.xml). Output file formats are plain text and html. - The plain text and the html format is generated with xslt. There are two _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
