From patchwork Sun Oct 13 23:27:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2185 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 CF4636196E for ; Mon, 14 Oct 2019 01:28:03 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6F1C933A for ; Mon, 14 Oct 2019 01:28:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1571009283; bh=q/SCJ6Yq4hXUsx5bb0H6QxnjzRdVXL9/wz89SxmhqHo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=pKQGCvDg99q6jiSmrx6KcWnT85w/BssSSsERKrvI4u3rf5qLF8sCGarMnFj2PM/Vv QYAU8WsDmdxphby0EVUfbSUuRh89GYTE+r28Dkm/fJyczKj7RqEq3tNwvEBAsDE1kk rXB8Q4bJTLU0ZeRVWJvdVIHOLSc3DXuuIhopPyZM= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Mon, 14 Oct 2019 02:27:49 +0300 Message-Id: <20191013232755.3292-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191013232755.3292-1-laurent.pinchart@ideasonboard.com> References: <20191013232755.3292-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 03/10] libcamera: controls: Prevent copies of ControlId class 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: Sun, 13 Oct 2019 23:28:04 -0000 Now that the V4L2ControlId embedded in V4L2ControlInfo has been moved out and doesn't require to be copied anymore, the base ControlId class doesn't need to be copyable either. Delete the ControlId copy constructor and copy assignment operator. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Jacopo Mondi --- include/libcamera/controls.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index ebc4204f98fd..5534a2edb567 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -68,12 +68,11 @@ protected: : id_(id), name_(name), type_(type) { } -#ifndef __DOXYGEN__ - ControlId &operator=(const ControlId &) = default; - ControlId(const ControlId &) = default; -#endif private: + ControlId &operator=(const ControlId &) = delete; + ControlId(const ControlId &) = delete; + unsigned int id_; std::string name_; ControlType type_;