summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-11-28 00:05:35 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-12-03 19:20:29 +0200
commit6b1e25693402a1db6cde995ae8e1b8bf74b88e17 (patch)
tree0e30abfd5792fcf40bceaf84aa859ae711f3e567
parent4b24b0bfe6dd1ec716a605b683e45cd47a0bd6ee (diff)
libcamera: Move compiler.h to base/
In preparation for usage of __nodiscard in the base API, move the compiler.h header to base. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
-rw-r--r--include/libcamera/base/compiler.h (renamed from include/libcamera/compiler.h)0
-rw-r--r--include/libcamera/base/meson.build1
-rw-r--r--include/libcamera/geometry.h2
-rw-r--r--include/libcamera/meson.build1
4 files changed, 2 insertions, 2 deletions
diff --git a/include/libcamera/compiler.h b/include/libcamera/base/compiler.h
index 02564f2f..02564f2f 100644
--- a/include/libcamera/compiler.h
+++ b/include/libcamera/base/compiler.h
diff --git a/include/libcamera/base/meson.build b/include/libcamera/base/meson.build
index 37c4435a..210a54f8 100644
--- a/include/libcamera/base/meson.build
+++ b/include/libcamera/base/meson.build
@@ -6,6 +6,7 @@ libcamera_base_headers = files([
'backtrace.h',
'bound_method.h',
'class.h',
+ 'compiler.h',
'event_dispatcher.h',
'event_dispatcher_poll.h',
'event_notifier.h',
diff --git a/include/libcamera/geometry.h b/include/libcamera/geometry.h
index 713f71c1..7838b679 100644
--- a/include/libcamera/geometry.h
+++ b/include/libcamera/geometry.h
@@ -10,7 +10,7 @@
#include <algorithm>
#include <string>
-#include <libcamera/compiler.h>
+#include <libcamera/base/compiler.h>
namespace libcamera {
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index 7155ff20..a8cca2a8 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -5,7 +5,6 @@ libcamera_include_dir = 'libcamera' / 'libcamera'
libcamera_public_headers = files([
'camera.h',
'camera_manager.h',
- 'compiler.h',
'controls.h',
'file_descriptor.h',
'framebuffer.h',