PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: Replace ARRAY_SIZE() with std::size()

Browse Source 
C++17 has a std::size() function that returns the size of a C-style
array. Use it instead of the custom ARRAY_SIZE macro.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Umang Jain <email@uajain.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart
2020-12-12 01:21:01 +02:00
parent bd4894d259
commit 5cfbbcd207
7 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libcamera/log.cpp
View File

@@ -7,6 +7,7 @@
#include "libcamera/internal/log.h"
#include <array>
#if HAVE_BACKTRACE
#include <execinfo.h>
#endif
@@ -91,7 +92,7 @@ static const char *log_severity_name(LogSeverity severity)
"FATAL",
};
if (static_cast<unsigned int>(severity) < ARRAY_SIZE(names))
if (static_cast<unsigned int>(severity) < std::size(names))
return names[severity];
else
return "UNKWN";
@@ -406,7 +407,7 @@ void Logger::backtrace()
return;
void *buffer[32];
int num_entries = ::backtrace(buffer, ARRAY_SIZE(buffer));
int num_entries = ::backtrace(buffer, std::size(buffer));
char **strings = backtrace_symbols(buffer, num_entries);
if (!strings)
return;
@@ -620,7 +621,7 @@ LogSeverity Logger::parseLogLevel(const std::string &level)
severity = LogInvalid;
} else {
severity = LogInvalid;
for (unsigned int i = 0; i < ARRAY_SIZE(names); ++i) {
for (unsigned int i = 0; i < std::size(names); ++i) {
if (names[i] == level) {
severity = i;
break;