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.lauhakangas@libreoffice.org> Tested-by: Jenkins
This commit is contained in:
parent
388b8fa5b2
commit
c3f0464097
1 changed files with 3 additions and 3 deletions
|
@ -41,7 +41,7 @@ char const* const* OtherInfo::getJavaExePaths(int * size)
|
||||||
"jre/bin/java"
|
"jre/bin/java"
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
*size = SAL_N_ELEMENTS (ar);
|
*size = std::size(ar);
|
||||||
return ar;
|
return ar;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,7 +71,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
};
|
};
|
||||||
*size = SAL_N_ELEMENTS(ar);
|
*size = std::size(ar);
|
||||||
return ar;
|
return ar;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,7 +93,7 @@ char const* const* OtherInfo::getLibraryPaths(int* size)
|
||||||
("/lib/" JFW_PLUGIN_ARCH)
|
("/lib/" JFW_PLUGIN_ARCH)
|
||||||
};
|
};
|
||||||
|
|
||||||
*size = SAL_N_ELEMENTS(ar);
|
*size = std::size(ar);
|
||||||
return ar;
|
return ar;
|
||||||
#else
|
#else
|
||||||
*size = 0;
|
*size = 0;
|
||||||
|
|
Loading…
Reference in a new issue