From 269859799481acec13e35bb6fb97458756e4991a Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Tue, 23 Nov 2021 17:23:07 +0000 Subject: test: 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 --- test/libtest/buffer_source.h | 6 ++---- test/libtest/camera_test.h | 6 ++---- test/libtest/test.h | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) (limited to 'test/libtest') diff --git a/test/libtest/buffer_source.h b/test/libtest/buffer_source.h index 84e2fa8f..0cc71aa5 100644 --- a/test/libtest/buffer_source.h +++ b/test/libtest/buffer_source.h @@ -4,8 +4,8 @@ * * buffer_source.h - libcamera camera test helper to create FrameBuffers */ -#ifndef __LIBCAMERA_BUFFER_SOURCE_TEST_H__ -#define __LIBCAMERA_BUFFER_SOURCE_TEST_H__ + +#pragma once #include @@ -25,5 +25,3 @@ private: std::shared_ptr media_; std::vector> buffers_; }; - -#endif /* __LIBCAMERA_BUFFER_SOURCE_TEST_H__ */ diff --git a/test/libtest/camera_test.h b/test/libtest/camera_test.h index 23122245..0b178bc2 100644 --- a/test/libtest/camera_test.h +++ b/test/libtest/camera_test.h @@ -4,8 +4,8 @@ * * camera_test.h - libcamera camera test base class */ -#ifndef __LIBCAMERA_CAMERA_TEST_H__ -#define __LIBCAMERA_CAMERA_TEST_H__ + +#pragma once #include @@ -23,5 +23,3 @@ protected: std::shared_ptr camera_; int status_; }; - -#endif /* __LIBCAMERA_CAMERA_TEST_H__ */ diff --git a/test/libtest/test.h b/test/libtest/test.h index 8ecf2bda..ee01a225 100644 --- a/test/libtest/test.h +++ b/test/libtest/test.h @@ -4,8 +4,8 @@ * * test.h - libcamera test base class */ -#ifndef __TEST_TEST_H__ -#define __TEST_TEST_H__ + +#pragma once #include @@ -34,5 +34,3 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char *argv[]) \ { \ return klass().execute(); \ } - -#endif /* __TEST_TEST_H__ */ -- cgit v1.2.1