From patchwork Mon Apr 15 16:56:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 983 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C651A60DBF for ; Mon, 15 Apr 2019 18:57:14 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 5C877333 for ; Mon, 15 Apr 2019 18:57:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1555347434; bh=dpMsSqVFr8uPm2fOOOAPDZdVkcjiYIyorTtBVSGEX48=; h=From:To:Subject:Date:In-Reply-To:References:From; b=wMSd1w9oanXfqvO3Xh7I/FX0/1cFK3ltG3RXliH9eAwzou96NdWEL7lb03Y2Kj6n5 dm8RvsAmbrysy2DgKkxnt6mDrLiJlGUSBZbNVrVQn2twnFj/ra+TgcHq/7GdRDiRmm nS+vQJRLDpXUzcWpUK9T8x3/ZJrP3cNYovGS1yDk= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Mon, 15 Apr 2019 19:56:51 +0300 Message-Id: <20190415165700.22970-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415165700.22970-1-laurent.pinchart@ideasonboard.com> References: <20190415165700.22970-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 02/11] libcamera: log: Mark Loggable::_log() methods as const X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Apr 2019 16:57:15 -0000 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 Reviewed-by: Niklas Söderlund Reviewed-by: Jacopo Mondi --- 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);