[{"id":15146,"web_url":"https://patchwork.libcamera.org/comment/15146/","msgid":"","date":"2021-02-12T14:08:49","subject":"Re: [libcamera-devel] [PATCH v3 4/7] libcamera: media_object:\n\tUtilise LIBCAMERA_DISABLE_COPY_AND_MOVE","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nOn Fri, Feb 12, 2021 at 01:30:53PM +0000, Kieran Bingham wrote:\n> Convert MediaLink, MediaPad, and MediaEntity to declare\n> LIBCAMERA_DISABLE_COPY_AND_MOVE. These classes already deleted their\n> copy constructor but not the assignment operator.\n> \n> They should also not be movable, so expand to fully disable both copying\n> and moving.\n> \n> Signed-off-by: Kieran Bingham \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> include/libcamera/internal/media_object.h | 11 ++++++++---\n> 1 file changed, 8 insertions(+), 3 deletions(-)\n> \n> diff --git a/include/libcamera/internal/media_object.h b/include/libcamera/internal/media_object.h\n> index 2b336961f98d..1c82c27928a8 100644\n> --- a/include/libcamera/internal/media_object.h\n> +++ b/include/libcamera/internal/media_object.h\n> @@ -12,6 +12,8 @@\n> \n> #include \n> \n> +#include \n> +\n> namespace libcamera {\n> \n> class MediaDevice;\n> @@ -47,11 +49,12 @@ public:\n> \tint setEnabled(bool enable);\n> \n> private:\n> +\tLIBCAMERA_DISABLE_COPY_AND_MOVE(MediaLink)\n> +\n> \tfriend class MediaDevice;\n> \n> \tMediaLink(const struct media_v2_link *link,\n> \t\t MediaPad *source, MediaPad *sink);\n> -\tMediaLink(const MediaLink &) = delete;\n> \n> \tMediaPad *source_;\n> \tMediaPad *sink_;\n> @@ -69,10 +72,11 @@ public:\n> \tvoid addLink(MediaLink *link);\n> \n> private:\n> +\tLIBCAMERA_DISABLE_COPY_AND_MOVE(MediaPad)\n> +\n> \tfriend class MediaDevice;\n> \n> \tMediaPad(const struct media_v2_pad *pad, MediaEntity *entity);\n> -\tMediaPad(const MediaPad &) = delete;\n> \n> \tunsigned int index_;\n> \tMediaEntity *entity_;\n> @@ -99,11 +103,12 @@ public:\n> \tint setDeviceNode(const std::string &deviceNode);\n> \n> private:\n> +\tLIBCAMERA_DISABLE_COPY_AND_MOVE(MediaEntity)\n> +\n> \tfriend class MediaDevice;\n> \n> \tMediaEntity(MediaDevice *dev, const struct media_v2_entity *entity,\n> \t\t unsigned int major = 0, unsigned int minor = 0);\n> -\tMediaEntity(const MediaEntity &) = delete;\n> \n> \tvoid addPad(MediaPad *pad);\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 0F576BD160\n\tfor ;\n\tFri, 12 Feb 2021 14:09:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CE03263787;\n\tFri, 12 Feb 2021 15:09:16 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 58A4263781\n\tfor ;\n\tFri, 12 Feb 2021 15:09:15 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id DB1058B5;\n\tFri, 12 Feb 2021 15:09:14 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Vx1Nx/5X\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1613138955;\n\tbh=CHigZ0qPyvit2Hj9i3T3jH6npkqEvAhoYDDvm1e8v5A=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Vx1Nx/5XLDxqqtXW3y9B1AFUb1MfY+e5rukgETHFtEA4v3Lw/UQQqKs81tDf0tgDx\n\tAJ/xXa2hGCi+1lC7i0NJy4JYgT/wgjeO6OvC8nUGiWg9InH9bvyc3w4HXjfAEP3HMT\n\tlcM5QXgM93+T2+l14DcSsoDVAEkJURyqhNC/4sos=","Date":"Fri, 12 Feb 2021 16:08:49 +0200","From":"Laurent Pinchart ","To":"Kieran Bingham ","Message-ID":"","References":"<20210212133056.873230-1-kieran.bingham@ideasonboard.com>\n\t<20210212133056.873230-5-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210212133056.873230-5-kieran.bingham@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v3 4/7] libcamera: media_object:\n\tUtilise LIBCAMERA_DISABLE_COPY_AND_MOVE","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera devel ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]