diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-08-18 10:51:20 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-08-18 11:45:52 +0200 |
| commit | 15914df5f0d857b038ae5580c483541a6c0826fc (patch) | |
| tree | 518da1a68b5359edf6d618e29005803b29a24a8a /jvmfwk | |
| parent | dcff0c200f25e8f2906901708841d1f680e8cc63 (diff) | |
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 <sbergman@redhat.com>
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 2 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
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; |