From b3ff91a57d3ebd786798d6cef74e29a247e8d001 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Tue, 23 Nov 2021 17:23:07 +0000 Subject: lc-compliance: Convert to pragma once 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 Reviewed-by: Laurent Pinchart Reviewed-by: Jean-Michel Hautbois --- 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 ba308732..0debbcce 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 100ffd66..9d31f7cb 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__ */ -- cgit v1.2.1