[libcamera-devel,2/5] libcamera: buffer: Utilise DELETE_COPY_MOVE_AND_ASSIGN
diff mbox series

Message ID 20201022135605.614240-3-kieran.bingham@ideasonboard.com
State Superseded
Delegated to: Kieran Bingham
Headers show
Series
  • Delete Copy-Move-Assign
Related show

Commit Message

Kieran Bingham Oct. 22, 2020, 1:56 p.m. UTC 
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 include/libcamera/buffer.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Comments

Laurent Pinchart Oct. 23, 2020, 4:24 a.m. UTC | #1 
Hi Kieran,

Thank you for the patch.

On Thu, Oct 22, 2020 at 02:56:02PM +0100, Kieran Bingham wrote:
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  include/libcamera/buffer.h | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/include/libcamera/buffer.h b/include/libcamera/buffer.h
> index a26c8927d37a..42a20a387781 100644
> --- a/include/libcamera/buffer.h
> +++ b/include/libcamera/buffer.h
> @@ -10,6 +10,7 @@
>  #include <stdint.h>
>  #include <vector>
>  
> +#include <libcamera/class.h>
>  #include <libcamera/file_descriptor.h>
>  
>  namespace libcamera {
> @@ -43,12 +44,6 @@ public:
>  
>  	FrameBuffer(const std::vector<Plane> &planes, unsigned int cookie = 0);
>  
> -	FrameBuffer(const FrameBuffer &) = delete;
> -	FrameBuffer(FrameBuffer &&) = delete;
> -
> -	FrameBuffer &operator=(const FrameBuffer &) = delete;
> -	FrameBuffer &operator=(FrameBuffer &&) = delete;
> -
>  	const std::vector<Plane> &planes() const { return planes_; }
>  
>  	Request *request() const { return request_; }
> @@ -57,7 +52,10 @@ public:
>  
>  	unsigned int cookie() const { return cookie_; }
>  	void setCookie(unsigned int cookie) { cookie_ = cookie; }
> +
>  private:
> +	DELETE_COPY_MOVE_AND_ASSIGN(FrameBuffer);
> +
>  	friend class Request; /* Needed to update request_. */
>  	friend class V4L2VideoDevice; /* Needed to update metadata_. */
>

Patch
diff mbox series 

diff --git a/include/libcamera/buffer.h b/include/libcamera/buffer.h
index a26c8927d37a..42a20a387781 100644
--- a/include/libcamera/buffer.h
+++ b/include/libcamera/buffer.h
@@ -10,6 +10,7 @@ 
 #include <stdint.h>
 #include <vector>
 
+#include <libcamera/class.h>
 #include <libcamera/file_descriptor.h>
 
 namespace libcamera {
@@ -43,12 +44,6 @@  public:
 
 	FrameBuffer(const std::vector<Plane> &planes, unsigned int cookie = 0);
 
-	FrameBuffer(const FrameBuffer &) = delete;
-	FrameBuffer(FrameBuffer &&) = delete;
-
-	FrameBuffer &operator=(const FrameBuffer &) = delete;
-	FrameBuffer &operator=(FrameBuffer &&) = delete;
-
 	const std::vector<Plane> &planes() const { return planes_; }
 
 	Request *request() const { return request_; }
@@ -57,7 +52,10 @@  public:
 
 	unsigned int cookie() const { return cookie_; }
 	void setCookie(unsigned int cookie) { cookie_ = cookie; }
+
 private:
+	DELETE_COPY_MOVE_AND_ASSIGN(FrameBuffer);
+
 	friend class Request; /* Needed to update request_. */
 	friend class V4L2VideoDevice; /* Needed to update metadata_. */