cppuhelper/source/typemanager.cxx | 2 +- jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 2 +- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit d397c4667882265a9caa1d7976c56a1d041c7825 Author: Stephan Bergmann <[email protected]> AuthorDate: Tue Aug 18 10:51:20 2020 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Mar 28 08:04:48 2025 +0100 Silence new Clang 12 trunk -Werror,-Wstring-concatenation "suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma?" Change-Id: I83828d8cc6f8ab9b0c1ca8a1c3fb528592c46504 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100897 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit 15914df5f0d857b038ae5580c483541a6c0826fc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183384 Tested-by: allotropia jenkins <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 8a10d39a89e3..fd2468edf65e 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -90,7 +90,7 @@ char const* const* OtherInfo::getLibraryPaths(int* size) "/lib/" JFW_PLUGIN_ARCH "/classic", "/lib/" JFW_PLUGIN_ARCH "/jrockit", "/lib/" JFW_PLUGIN_ARCH "/native_threads", - "/lib/" JFW_PLUGIN_ARCH + ("/lib/" JFW_PLUGIN_ARCH) }; *size = SAL_N_ELEMENTS(ar); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index 89731ad15ddc..51d5046c203f 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -82,7 +82,7 @@ char const* const* SunInfo::getLibraryPaths(int* size) "/lib/" JFW_PLUGIN_ARCH "/client", "/lib/" JFW_PLUGIN_ARCH "/server", "/lib/" JFW_PLUGIN_ARCH "/native_threads", - "/lib/" JFW_PLUGIN_ARCH + ("/lib/" JFW_PLUGIN_ARCH) }; *size = SAL_N_ELEMENTS(ar); return ar; commit 8d61e30cb76b2da30ad70b074e64bdd917297d12 Author: Stephan Bergmann <[email protected]> AuthorDate: Tue Aug 11 20:22:31 2020 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Mar 28 08:04:36 2025 +0100 -Werror,-Wuninitialized (apparently new in Clang 12 trunk) > cppuhelper/source/typemanager.cxx:1571:47: error: field 'entity_' is uninitialized when used here [-Werror,-Wuninitialized] > ServiceBasedSingletonDescription_Base(entity_->isPublished()), > ^ The code was like that ever since it was introduced in fa559f1c416884015d1d83d0a7ac8803e745d9df "WIP: Experimental new binary type.rdb format". Odd that that never caused an issue, but the code appears to at least never be executed during `make check`. Change-Id: I19fe78162c7c4a9211c380648595df9aa54bf4d7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100554 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit 986bd8b93b35ad7f2760dfe0576860532daa0e42) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183383 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: allotropia jenkins <[email protected]> diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx index f3fa99ac9769..1b1653ae06a2 100644 --- a/cppuhelper/source/typemanager.cxx +++ b/cppuhelper/source/typemanager.cxx @@ -1568,7 +1568,7 @@ public: rtl::Reference< cppuhelper::TypeManager > const & manager, OUString const & name, rtl::Reference< unoidl::ServiceBasedSingletonEntity > const & entity): - ServiceBasedSingletonDescription_Base(entity_->isPublished()), + ServiceBasedSingletonDescription_Base(entity->isPublished()), manager_(manager), name_(name), entity_(entity) { assert(manager.is()); assert(entity.is()); }
