{"id":11264,"url":"https://patchwork.libcamera.org/api/1.1/patches/11264/?format=json","web_url":"https://patchwork.libcamera.org/patch/11264/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210212133056.873230-5-kieran.bingham@ideasonboard.com>","date":"2021-02-12T13:30:53","name":"[libcamera-devel,v3,4/7] libcamera: media_object: Utilise LIBCAMERA_DISABLE_COPY_AND_MOVE","commit_ref":"234ee715176d1b631597ff535c8b82e66f59406f","pull_url":null,"state":"accepted","archived":false,"hash":"b3c03690b953299e5482e129bfc2123355c98966","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11264/mbox/","series":[{"id":1685,"url":"https://patchwork.libcamera.org/api/1.1/series/1685/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1685","date":"2021-02-12T13:30:49","name":"Delete Copy-Move-Assign","version":3,"mbox":"https://patchwork.libcamera.org/series/1685/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11264/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11264/checks/","tags":{},"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 04813BD16C\n\tfor ;\n\tFri, 12 Feb 2021 13:31:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D920D63785;\n\tFri, 12 Feb 2021 14:31:04 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6526763772\n\tfor ;\n\tFri, 12 Feb 2021 14:31:01 +0100 (CET)","from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0D2C31540;\n\tFri, 12 Feb 2021 14:31:01 +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=\"S+IRGq3s\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1613136661;\n\tbh=zb+6P1jPo6STlRX9YTnt+JJYz8sHeSHJsB9lYrNZm8s=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=S+IRGq3so1lm8EQ/T7TyNgoCAI30f8k0qnqJrxZpmJWIUGteKhr3bEXEW3t/9aICj\n\tRfMPHEnZL2BdCY9grcDTGxpfxWCno/OkMoxLdWifRcge1s2nAIhwGyMVj2Lu4onSn3\n\tBIEX3ZSg53wiV2ab8xS9v6J+8o3LCtXuwMn1TPAA=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Fri, 12 Feb 2021 13:30:53 +0000","Message-Id":"<20210212133056.873230-5-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20210212133056.873230-1-kieran.bingham@ideasonboard.com>","References":"<20210212133056.873230-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 4/7] libcamera: media_object: Utilise\n\tLIBCAMERA_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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Convert MediaLink, MediaPad, and MediaEntity to declare\nLIBCAMERA_DISABLE_COPY_AND_MOVE. These classes already deleted their\ncopy constructor but not the assignment operator.\n\nThey should also not be movable, so expand to fully disable both copying\nand moving.\n\nSigned-off-by: Kieran Bingham \n---\n include/libcamera/internal/media_object.h | 11 ++++++++---\n 1 file changed, 8 insertions(+), 3 deletions(-)","diff":"diff --git a/include/libcamera/internal/media_object.h b/include/libcamera/internal/media_object.h\nindex 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 \n","prefixes":["libcamera-devel","v3","4/7"]}