From patchwork Sat Jan 4 05:09:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2500 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3CA3160466 for ; Sat, 4 Jan 2020 06:10:04 +0100 (CET) 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 D9AB830F for ; Sat, 4 Jan 2020 06:10:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1578114604; bh=Q31aLLJP61ph/JvgeiUo+dtOidufq2NNa6OwPbOIvOU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=GYvSShe4/vC5KbxjgX7AlXVjpXMP2Qn8GgJMHFxE1lK8dli8Se7r1ti3xaaIgu7KI QJRyhOSJyCH0g15IOSKkCQ5Z0gC9NGU3tGEoechyRDqrMhd62ayaUxw+rHWK7gDV6s qGzpXYpqUKu/Jjo0tTsSUhynjpo7RV0KoNYtyllI= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 4 Jan 2020 07:09:37 +0200 Message-Id: <20200104050947.7673-5-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200104050947.7673-1-laurent.pinchart@ideasonboard.com> References: <20200104050947.7673-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 04/14] libcamera: bound_method: Mark overriden methods 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: Sat, 04 Jan 2020 05:10:04 -0000 Mark the activate() and invoke() methods with the override keyword where appropriate. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- include/libcamera/bound_method.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h index 5743cacf5388..f23b17c7dd98 100644 --- a/include/libcamera/bound_method.h +++ b/include/libcamera/bound_method.h @@ -107,7 +107,7 @@ public: bool match(void (T::*func)(Args...)) const { return func == func_; } - void activate(Args... args, bool deleteMethod = false) + void activate(Args... args, bool deleteMethod = false) override { if (this->object_) BoundMethodBase::activatePack(new PackType{ args... }, deleteMethod); @@ -115,7 +115,7 @@ public: (static_cast(this->obj_)->*func_)(args...); } - void invoke(Args... args) + void invoke(Args... args) override { (static_cast(this->obj_)->*func_)(args...); } @@ -136,12 +136,12 @@ public: bool match(void (*func)(Args...)) const { return func == func_; } - void activate(Args... args, bool deleteMethod = false) + void activate(Args... args, bool deleteMethod = false) override { (*func_)(args...); } - void invoke(Args...) {} + void invoke(Args...) override {} private: void (*func_)(Args...);