[libcamera-devel,v3,3/7] libcamera: buffer: Utilise LIBCAMERA_DISABLE_COPY_AND_MOVE
diff mbox series

Message ID 20210212133056.873230-4-kieran.bingham@ideasonboard.com
State Accepted
Commit 74f103486c44f548f326c21df745ef2280a9a7fb
Headers show
Series
  • Delete Copy-Move-Assign
Related show

Commit Message

Kieran Bingham Feb. 12, 2021, 1:30 p.m. UTC 
Convert the existing copy, move and assignment operators to use the new
macros.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 include/libcamera/buffer.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Patch
diff mbox series 

diff --git a/include/libcamera/buffer.h b/include/libcamera/buffer.h
index a26c8927d37a..302fe3d3e86b 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:
+	LIBCAMERA_DISABLE_COPY_AND_MOVE(FrameBuffer)
+
 	friend class Request; /* Needed to update request_. */
 	friend class V4L2VideoDevice; /* Needed to update metadata_. */