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>

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 {
 

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',

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__ */

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 {
 

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 {
 

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 {
 

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;

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 {
 

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',
 ])