core.git: 2 commits - jvmfwk/plugins

[LeSci-0x1 (via logerrit)]

 jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx |    6 +++---
 jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx   |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit c3f04640979d4f9d9abe8dc3e645d058e1cfb182
Author:     LeSci-0x1 <ssc...@csumb.edu>
AuthorDate: Sun Dec 1 22:15:24 2024 -0800
Commit:     Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Mon Dec 2 09:36:19 2024 +0100

    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 <ilmari.lauhakan...@libreoffice.org>
    Tested-by: Jenkins

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;
commit 388b8fa5b28df532cd87689a35a38905b0cd038a
Author:     LeSci-0x1 <ssc...@csumb.edu>
AuthorDate: Sun Dec 1 21:12:47 2024 -0800
Commit:     Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Mon Dec 2 09:36:11 2024 +0100

    tdf#147021 - Use std::size() instead of SAL_N_ELEMENTS() macro
    
    Change-Id: I3d8b65f0ef386eed2ada12664aa33d2efd53fb65
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177641
    Tested-by: Jenkins
    Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index a0f8cbee1f3e..c04337cddc18 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -43,7 +43,7 @@ char const* const* SunInfo::getJavaExePaths(int * size)
         "jre/bin/java"
 #endif
     };
-    *size = SAL_N_ELEMENTS(ar);
+    *size = std::size(ar);
     return ar;
 }
 
@@ -69,7 +69,7 @@ char const* const* SunInfo::getRuntimePaths(int * size)
         "/lib/server/libjvm.so"
 #endif
     };
-    *size = SAL_N_ELEMENTS(ar);
+    *size = std::size(ar);
     return ar;
 }
 
@@ -82,7 +82,7 @@ char const* const* SunInfo::getLibraryPaths(int* size)
         "/lib/" JFW_PLUGIN_ARCH "/native_threads",
         ("/lib/" JFW_PLUGIN_ARCH)
     };
-    *size = SAL_N_ELEMENTS(ar);
+    *size = std::size(ar);
     return ar;
 #else
     *size = 0;