diff options
| author | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-06-25 02:15:54 +0100 |
|---|---|---|
| committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-06-25 16:11:11 +0100 |
| commit | b71e8c2f39d823891aab4c681cccab9af5a49406 (patch) | |
| tree | 62b79f3a300a54b08501bf0becd533db609e6937 /include | |
| parent | f9ee72430735f749fb7d8fd4a8fe01ca88dc1f88 (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')
| -rw-r--r-- | include/libcamera/base/file.h | 3 | ||||
| -rw-r--r-- | include/libcamera/base/meson.build | 1 | ||||
| -rw-r--r-- | include/libcamera/base/span.h (renamed from include/libcamera/span.h) | 6 | ||||
| -rw-r--r-- | include/libcamera/controls.h | 2 | ||||
| -rw-r--r-- | include/libcamera/internal/buffer.h | 2 | ||||
| -rw-r--r-- | include/libcamera/internal/byte_stream_buffer.h | 3 | ||||
| -rw-r--r-- | include/libcamera/internal/pub_key.h | 2 | ||||
| -rw-r--r-- | include/libcamera/internal/v4l2_device.h | 2 | ||||
| -rw-r--r-- | include/libcamera/meson.build | 1 |
9 files changed, 10 insertions, 12 deletions
diff --git a/include/libcamera/base/file.h b/include/libcamera/base/file.h index 5cd98579..465f3ef8 100644 --- a/include/libcamera/base/file.h +++ b/include/libcamera/base/file.h @@ -13,8 +13,7 @@ #include <string> #include <libcamera/base/class.h> - -#include <libcamera/span.h> +#include <libcamera/base/span.h> namespace libcamera { diff --git a/include/libcamera/base/meson.build b/include/libcamera/base/meson.build index 83c664af..6b90f9f7 100644 --- a/include/libcamera/base/meson.build +++ b/include/libcamera/base/meson.build @@ -14,6 +14,7 @@ libcamera_base_headers = files([ 'object.h', 'semaphore.h', 'signal.h', + 'span.h', 'thread.h', 'timer.h', 'utils.h', diff --git a/include/libcamera/span.h b/include/libcamera/base/span.h index 7a35806b..21099d56 100644 --- a/include/libcamera/span.h +++ b/include/libcamera/base/span.h @@ -5,8 +5,8 @@ * span.h - C++20 std::span<> implementation for C++11 */ -#ifndef __LIBCAMERA_SPAN_H__ -#define __LIBCAMERA_SPAN_H__ +#ifndef __LIBCAMERA_BASE_SPAN_H__ +#define __LIBCAMERA_BASE_SPAN_H__ #include <array> #include <iterator> @@ -421,4 +421,4 @@ private: } /* namespace libcamera */ -#endif /* __LIBCAMERA_SPAN_H__ */ +#endif /* __LIBCAMERA_BASE_SPAN_H__ */ diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index f62b6cf0..1bc958a4 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -15,9 +15,9 @@ #include <vector> #include <libcamera/base/class.h> +#include <libcamera/base/span.h> #include <libcamera/geometry.h> -#include <libcamera/span.h> namespace libcamera { 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 { diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index c69d63d2..e4d5c655 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -12,7 +12,6 @@ libcamera_public_headers = files([ 'logging.h', 'pixel_format.h', 'request.h', - 'span.h', 'stream.h', 'transform.h', ]) |