summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2021-02-12 12:12:49 +0000
committerKieran Bingham <kieran.bingham@ideasonboard.com>2021-02-12 14:35:17 +0000
commit83c5a2a7aa67b609bc5c14698b76b9eaee644d17 (patch)
tree624aa22513e415bb0be5a3c422c7a78a21fec5f4
parent234ee715176d1b631597ff535c8b82e66f59406f (diff)
libcamera: controls: Utilise LIBCAMERA_DISABLE_COPY_AND_MOVE
The ControlId and Control classes disable the copy constructor and assignment operator, but they should also prevent move construction and assignment. Utilise LIBCAMERA_DISABLE_COPY_AND_MOVE to fully disable these functions. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rw-r--r--include/libcamera/controls.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h
index 3b7f3347..1a5690a5 100644
--- a/include/libcamera/controls.h
+++ b/include/libcamera/controls.h
@@ -14,6 +14,7 @@
#include <unordered_map>
#include <vector>
+#include <libcamera/class.h>
#include <libcamera/geometry.h>
#include <libcamera/span.h>
@@ -220,8 +221,7 @@ public:
ControlType type() const { return type_; }
private:
- ControlId &operator=(const ControlId &) = delete;
- ControlId(const ControlId &) = delete;
+ LIBCAMERA_DISABLE_COPY_AND_MOVE(ControlId)
unsigned int id_;
std::string name_;
@@ -260,8 +260,7 @@ public:
}
private:
- Control(const Control &) = delete;
- Control &operator=(const Control &) = delete;
+ LIBCAMERA_DISABLE_COPY_AND_MOVE(Control)
};
class ControlInfo