From 5cfbbcd20731a2160206cc1d935eac2c770376ae Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 12 Dec 2020 01:21:01 +0200 Subject: libcamera: Replace ARRAY_SIZE() with std::size() 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 Reviewed-by: Paul Elder Reviewed-by: Umang Jain Reviewed-by: Jacopo Mondi --- src/libcamera/log.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/libcamera/log.cpp') diff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp index 180eb97b..45c7c2d2 100644 --- a/src/libcamera/log.cpp +++ b/src/libcamera/log.cpp @@ -7,6 +7,7 @@ #include "libcamera/internal/log.h" +#include #if HAVE_BACKTRACE #include #endif @@ -91,7 +92,7 @@ static const char *log_severity_name(LogSeverity severity) "FATAL", }; - if (static_cast(severity) < ARRAY_SIZE(names)) + if (static_cast(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; -- cgit v1.2.1