[v3,1/8] libcamera: base: log: Remove move constructor
diff mbox series

Message ID 20250217185433.306833-2-pobrn@protonmail.com
State Superseded
Headers show
Series
  • libcamera: base: log: Misc. changes
Related show

Commit Message

Barnabás Pőcze Feb. 17, 2025, 6:54 p.m. UTC 
C++17 guarantees move and copy elision in certain cases,
such as when returning a prvalue of the same type as the
return type of the function.

This is what the `_log()` functions do, thus there is no need
for the move constructor, so remove it. Furthermore, do not
just remove the implementation, but instead delete it as well.

Signed-off-by: Barnabás Pőcze <pobrn@protonmail.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 include/libcamera/base/log.h |  4 +---
 src/libcamera/base/log.cpp   | 19 -------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

Patch
diff mbox series 

diff --git a/include/libcamera/base/log.h b/include/libcamera/base/log.h
index cfe26f883..7a101d8ba 100644
--- a/include/libcamera/base/log.h
+++ b/include/libcamera/base/log.h
@@ -61,8 +61,6 @@  public:
 	LogMessage(const char *fileName, unsigned int line,
 		   const LogCategory &category, LogSeverity severity,
 		   const std::string &prefix = std::string());
-
-	LogMessage(LogMessage &&);
 	~LogMessage();
 
 	[[nodiscard]] std::ostream &stream() { return msgStream_; }
@@ -75,7 +73,7 @@  public:
 	const std::string msg() const { return msgStream_.str(); }
 
 private:
-	LIBCAMERA_DISABLE_COPY(LogMessage)
+	LIBCAMERA_DISABLE_COPY_AND_MOVE(LogMessage)
 
 	void init(const char *fileName, unsigned int line);
 
diff --git a/src/libcamera/base/log.cpp b/src/libcamera/base/log.cpp
index fd1427d0b..8c72a005d 100644
--- a/src/libcamera/base/log.cpp
+++ b/src/libcamera/base/log.cpp
@@ -866,25 +866,6 @@  LogMessage::LogMessage(const char *fileName, unsigned int line,
 	init(fileName, line);
 }
 
-/**
- * \brief Move-construct a log message
- * \param[in] other The other message
- *
- * The move constructor is meant to support the _log() functions. Thanks to copy
- * elision it will likely never be called, but C++11 only permits copy elision,
- * it doesn't enforce it unlike C++17. To avoid potential link errors depending
- * on the compiler type and version, and optimization level, the move
- * constructor is defined even if it will likely never be called, and ensures
- * that the destructor of the \a other message will not output anything to the
- * log by setting the severity to LogInvalid.
- */
-LogMessage::LogMessage(LogMessage &&other)
-	: msgStream_(std::move(other.msgStream_)), category_(other.category_),
-	  severity_(other.severity_)
-{
-	other.severity_ = LogInvalid;
-}
-
 void LogMessage::init(const char *fileName, unsigned int line)
 {
 	/* Log the timestamp, severity and file information. */