| Message ID | 20211128235752.10836-2-laurent.pinchart@ideasonboard.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series |
|
| Related | show |
Hi Laurent, thank you for the patch. On Mon, Nov 29, 2021 at 8:58 AM Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > > 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> > --- > 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 525aba9d2919..23dd4e2023a8 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 713f71c180c6..7838b6793617 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 7155ff203f6e..a8cca2a88cad 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', > -- > Regards, > > Laurent Pinchart >
Hi Laurent, On Mon, Nov 29, 2021 at 01:57:36AM +0200, Laurent Pinchart wrote: > 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: Jacopo Mondi <jacopo@jmondi.org> Thanks j > --- > 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 525aba9d2919..23dd4e2023a8 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 713f71c180c6..7838b6793617 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 7155ff203f6e..a8cca2a88cad 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', > -- > Regards, > > Laurent Pinchart >
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 525aba9d2919..23dd4e2023a8 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 713f71c180c6..7838b6793617 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 7155ff203f6e..a8cca2a88cad 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',
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> --- 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%)