[libcamera-devel] [PATCH v2 02/13] libcamera: log: Mark Loggable::_log() methods as const

Laurent Pinchart laurent.pinchart at ideasonboard.com
Wed Apr 17 00:08:28 CEST 2019


The methods don't modify the object instance, mark them as const. This
allows using the LOG() macro from a const method of a Loggable object.

Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo at jmondi.org>
---
 src/libcamera/include/log.h | 5 +++--
 src/libcamera/log.cpp       | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/libcamera/include/log.h b/src/libcamera/include/log.h
index 8ea5a1eb673a..35a6fc105448 100644
--- a/src/libcamera/include/log.h
+++ b/src/libcamera/include/log.h
@@ -76,9 +76,10 @@ protected:
 	virtual std::string logPrefix() const = 0;
 
 	LogMessage _log(const char *file, unsigned int line,
-			LogSeverity severity);
+			LogSeverity severity) const;
 	LogMessage _log(const char *file, unsigned int line,
-			const LogCategory &category, LogSeverity severity);
+			const LogCategory &category,
+			LogSeverity severity) const;
 };
 
 LogMessage _log(const char *file, unsigned int line, LogSeverity severity);
diff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp
index 71cfbc422ba0..77927ec35b62 100644
--- a/src/libcamera/log.cpp
+++ b/src/libcamera/log.cpp
@@ -506,7 +506,7 @@ Loggable::~Loggable()
  * \return A log message
  */
 LogMessage Loggable::_log(const char *fileName, unsigned int line,
-			  LogSeverity severity)
+			  LogSeverity severity) const
 {
 	LogMessage msg(fileName, line, severity);
 
@@ -527,7 +527,8 @@ LogMessage Loggable::_log(const char *fileName, unsigned int line,
  * \return A log message
  */
 LogMessage Loggable::_log(const char *fileName, unsigned int line,
-			  const LogCategory &category, LogSeverity severity)
+			  const LogCategory &category,
+			  LogSeverity severity) const
 {
 	LogMessage msg(fileName, line, category, severity);
 
-- 
Regards,

Laurent Pinchart



More information about the libcamera-devel mailing list