From 6b1e25693402a1db6cde995ae8e1b8bf74b88e17 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sun, 28 Nov 2021 00:05:35 +0200
Subject: [PATCH] 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>
---
 include/libcamera/{ => base}/compiler.h | 0
 include/libcamera/base/meson.build      | 1 +
 include/libcamera/geometry.h            | 2 +-
 include/libcamera/meson.build           | 1 -
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename include/libcamera/{ => base}/compiler.h (100%)

diff --git a/include/libcamera/compiler.h b/include/libcamera/base/compiler.h
similarity index 100%
rename from include/libcamera/compiler.h
rename to 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',