summaryrefslogtreecommitdiff
path: root/include/libcamera/internal
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2021-06-25 02:15:54 +0100
committerKieran Bingham <kieran.bingham@ideasonboard.com>2021-06-25 16:11:11 +0100
commitb71e8c2f39d823891aab4c681cccab9af5a49406 (patch)
tree62b79f3a300a54b08501bf0becd533db609e6937 /include/libcamera/internal
parentf9ee72430735f749fb7d8fd4a8fe01ca88dc1f88 (diff)
libcamera/base: Move span to base library
Move span, and adjust the Doxygen exclusion as well. Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'include/libcamera/internal')
-rw-r--r--include/libcamera/internal/buffer.h2
-rw-r--r--include/libcamera/internal/byte_stream_buffer.h3
-rw-r--r--include/libcamera/internal/pub_key.h2
-rw-r--r--include/libcamera/internal/v4l2_device.h2
4 files changed, 4 insertions, 5 deletions
diff --git a/include/libcamera/internal/buffer.h b/include/libcamera/internal/buffer.h
index 91dd2496..beae0cb9 100644
--- a/include/libcamera/internal/buffer.h
+++ b/include/libcamera/internal/buffer.h
@@ -11,9 +11,9 @@
#include <vector>
#include <libcamera/base/class.h>
+#include <libcamera/base/span.h>
#include <libcamera/buffer.h>
-#include <libcamera/span.h>
namespace libcamera {
diff --git a/include/libcamera/internal/byte_stream_buffer.h b/include/libcamera/internal/byte_stream_buffer.h
index 7eefb1a7..d0f0df5e 100644
--- a/include/libcamera/internal/byte_stream_buffer.h
+++ b/include/libcamera/internal/byte_stream_buffer.h
@@ -12,8 +12,7 @@
#include <type_traits>
#include <libcamera/base/class.h>
-
-#include <libcamera/span.h>
+#include <libcamera/base/span.h>
namespace libcamera {
diff --git a/include/libcamera/internal/pub_key.h b/include/libcamera/internal/pub_key.h
index f5f988b5..9261c9c2 100644
--- a/include/libcamera/internal/pub_key.h
+++ b/include/libcamera/internal/pub_key.h
@@ -9,7 +9,7 @@
#include <stdint.h>
-#include <libcamera/span.h>
+#include <libcamera/base/span.h>
#if HAVE_GNUTLS
struct gnutls_pubkey_st;
diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h
index 1edd664a..77b835b3 100644
--- a/include/libcamera/internal/v4l2_device.h
+++ b/include/libcamera/internal/v4l2_device.h
@@ -15,9 +15,9 @@
#include <libcamera/base/log.h>
#include <libcamera/base/signal.h>
+#include <libcamera/base/span.h>
#include <libcamera/controls.h>
-#include <libcamera/span.h>
namespace libcamera {