jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 2 +-
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 15914df5f0d857b038ae5580c483541a6c0826fc
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Aug 18 10:51:20 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Aug 18 11:45:52 2020 +0200
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 <sberg...@redhat.com>
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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
