From patchwork Thu Jun 4 00:41:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3910 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 56E2A61012 for ; Thu, 4 Jun 2020 02:41:27 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="HqVEvlu5"; dkim-atps=neutral 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 DE95F29B for ; Thu, 4 Jun 2020 02:41:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1591231287; bh=b6nk+/zBqzwR2XVGjpvGdQVT7JXTE1fKggl30/UPtVo=; h=From:To:Subject:Date:From; b=HqVEvlu5DJbd4FRJhz1iLZIzvlEH81dRkJFsGfQYCsSQY2IJji4XaXZDzc6QMUIpN ni1rQPzIec6uDcAfPWo81KQ8cYmbi3DgVKTD6LF+V6OvHTJz1Je0km4FHU3soDexPM CU0bvHJtN9hpMIhmUMfTh3L3Td5XfiqvBCIRDW54= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Thu, 4 Jun 2020 03:41:06 +0300 Message-Id: <20200604004106.7240-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: Mark logPrefix() implementations with override X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 00:41:27 -0000 Virtual functions overriden in derived classes should be marked with the override keyword. Do so for the logPrefix() implementations inheriting from the Loggable class. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Niklas Söderlund --- include/libcamera/internal/camera_sensor.h | 2 +- include/libcamera/internal/media_device.h | 2 +- include/libcamera/internal/v4l2_subdevice.h | 2 +- include/libcamera/internal/v4l2_videodevice.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h index d79bd9ce9d58..eb464114cb3a 100644 --- a/include/libcamera/internal/camera_sensor.h +++ b/include/libcamera/internal/camera_sensor.h @@ -66,7 +66,7 @@ public: int sensorInfo(CameraSensorInfo *info) const; protected: - std::string logPrefix() const; + std::string logPrefix() const override; private: const MediaEntity *entity_; diff --git a/include/libcamera/internal/media_device.h b/include/libcamera/internal/media_device.h index 19af059d9291..20e397ccac49 100644 --- a/include/libcamera/internal/media_device.h +++ b/include/libcamera/internal/media_device.h @@ -55,7 +55,7 @@ public: Signal disconnected; protected: - std::string logPrefix() const; + std::string logPrefix() const override; private: int open(); diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h index 1be454f0ddda..07dc93d98776 100644 --- a/include/libcamera/internal/v4l2_subdevice.h +++ b/include/libcamera/internal/v4l2_subdevice.h @@ -62,7 +62,7 @@ public: const std::string &entity); protected: - std::string logPrefix() const; + std::string logPrefix() const override; private: std::vector enumPadCodes(unsigned int pad); diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h index dc259523599c..cbaee6149f34 100644 --- a/include/libcamera/internal/v4l2_videodevice.h +++ b/include/libcamera/internal/v4l2_videodevice.h @@ -213,7 +213,7 @@ public: V4L2PixelFormat toV4L2PixelFormat(const PixelFormat &pixelFormat); protected: - std::string logPrefix() const; + std::string logPrefix() const override; private: int getFormatMeta(V4L2DeviceFormat *format);