From patchwork Tue Nov 23 22:40:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 14742 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com 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 6204DC3250 for ; Tue, 23 Nov 2021 22:40:39 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 144EF6039C; Tue, 23 Nov 2021 23:40:39 +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="aHcLWJgy"; 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 3FECC603FC for ; Tue, 23 Nov 2021 23:40:23 +0100 (CET) Received: from Monstersaurus.ksquared.org.uk.beta.tailscale.net (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id CFE36A1B; Tue, 23 Nov 2021 23:40:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1637707222; bh=MTitkI/27Pj5UnW8Vgx+DW2Y2pw2fF6eTJy3KbMUnKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aHcLWJgyQK7DodOtOtjR8u9n6a13GKHWy96yFxqDvg7pJYCsxMRrkRfqsgTwZT+rZ DxY/yHuodNAUToFdjVJ2m6uo3T71DuDT9wR09fzCiEZMDPme6N+J/wXNOd66QTHRxb eWAFF+4xRjKNdPk5LvYd0iANXqIAq/h/2TfQ2bd4= From: Kieran Bingham To: libcamera devel Date: Tue, 23 Nov 2021 22:40:11 +0000 Message-Id: <20211123224015.3619282-12-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211123224015.3619282-1-kieran.bingham@ideasonboard.com> References: <20211123224015.3619282-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 11/15] lc-compliance: Convert to pragma once 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" Remove the verbose #ifndef/#define/#endif pattern for maintaining header idempotency, and replace it with a simple #pragma once. This simplifies the headers, and prevents redundant changes when header files get moved. Signed-off-by: Kieran Bingham --- src/lc-compliance/environment.h | 6 ++---- src/lc-compliance/simple_capture.h | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/lc-compliance/environment.h b/src/lc-compliance/environment.h index ba308732396e..0debbcce7150 100644 --- a/src/lc-compliance/environment.h +++ b/src/lc-compliance/environment.h @@ -4,8 +4,8 @@ * * environment.h - Common environment for tests */ -#ifndef __LC_COMPLIANCE_ENVIRONMENT_H__ -#define __LC_COMPLIANCE_ENVIRONMENT_H__ + +#pragma once #include @@ -25,5 +25,3 @@ private: std::string cameraId_; libcamera::CameraManager *cm_; }; - -#endif /* __LC_COMPLIANCE_ENVIRONMENT_H__ */ diff --git a/src/lc-compliance/simple_capture.h b/src/lc-compliance/simple_capture.h index 100ffd6637ad..9d31f7cb2e53 100644 --- a/src/lc-compliance/simple_capture.h +++ b/src/lc-compliance/simple_capture.h @@ -4,8 +4,8 @@ * * simple_capture.h - Simple capture helper */ -#ifndef __LC_COMPLIANCE_SIMPLE_CAPTURE_H__ -#define __LC_COMPLIANCE_SIMPLE_CAPTURE_H__ + +#pragma once #include @@ -63,5 +63,3 @@ private: unsigned int captureCount_; unsigned int captureLimit_; }; - -#endif /* __LC_COMPLIANCE_SIMPLE_CAPTURE_H__ */