From c3f04640979d4f9d9abe8dc3e645d058e1cfb182 Mon Sep 17 00:00:00 2001 From: LeSci-0x1 Date: Sun, 1 Dec 2024 22:15:24 -0800 Subject: [PATCH] tdf#147021 - Use std::size() instead of SAL_N_ELEMENTS() macro Change-Id: If8222286f36cda3071d63a14896d8d89c5802437 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177650 Reviewed-by: Ilmari Lauhakangas Tested-by: Jenkins --- jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 528af9498959..1dfa431fe949 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -41,7 +41,7 @@ char const* const* OtherInfo::getJavaExePaths(int * size) "jre/bin/java" #endif }; - *size = SAL_N_ELEMENTS (ar); + *size = std::size(ar); return ar; } @@ -71,7 +71,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size) #endif }; - *size = SAL_N_ELEMENTS(ar); + *size = std::size(ar); return ar; } @@ -93,7 +93,7 @@ char const* const* OtherInfo::getLibraryPaths(int* size) ("/lib/" JFW_PLUGIN_ARCH) }; - *size = SAL_N_ELEMENTS(ar); + *size = std::size(ar); return ar; #else *size = 0;