From patchwork Tue Nov 30 03:37:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 14856 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id E7CD2BF415 for ; Tue, 30 Nov 2021 03:38:53 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 351E1605B6; Tue, 30 Nov 2021 04:38:51 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="hpcBQrOE"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BB8A96059E for ; Tue, 30 Nov 2021 04:38:48 +0100 (CET) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 51A9111C5 for ; Tue, 30 Nov 2021 04:38:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1638243528; bh=mHTkR1XuociDJ7aEHQY71W9VUmG/4yt6XfsRxcbf8DM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=hpcBQrOEH+OvYNvsd2eyHZNZZj4VxTq/xQPPd+pCvMGTcmEmaNd+7NiS+Cv8gHeqG IVsp4O+5ZykV51YGsZBTxNz/9ceWpiBX6dmdXh5SkH2O16RtRZ07JyBNWBvfblC6rS kJILOFkL49UCfBJ5xANcRUQQXbeI9edc/Zg67Z6s= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 30 Nov 2021 05:37:59 +0200 Message-Id: <20211130033820.18235-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211130033820.18235-1-laurent.pinchart@ideasonboard.com> References: <20211130033820.18235-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 01/22] libcamera: Move compiler.h to base/ X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" In preparation for usage of __nodiscard in the base API, move the compiler.h header to base. Signed-off-by: Laurent Pinchart Reviewed-by: Hirokazu Honda Reviewed-by: Jacopo Mondi --- 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 #include -#include +#include 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',