{"id":14737,"url":"https://patchwork.libcamera.org/api/patches/14737/?format=json","web_url":"https://patchwork.libcamera.org/patch/14737/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20211123224015.3619282-7-kieran.bingham@ideasonboard.com>","date":"2021-11-23T22:40:06","name":"[libcamera-devel,06/15] android: Convert to pragma once","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"0549184a54de55e13339dae961b8d4aff98fa7dd","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":{"id":11,"url":"https://patchwork.libcamera.org/api/users/11/?format=json","username":"kbingham","first_name":"Kieran","last_name":"Bingham","email":"kieran.bingham@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/14737/mbox/","series":[{"id":2749,"url":"https://patchwork.libcamera.org/api/series/2749/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2749","date":"2021-11-23T22:40:00","name":"Use pragma once","version":1,"mbox":"https://patchwork.libcamera.org/series/2749/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14737/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14737/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id E6E6BBF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 23 Nov 2021 22:40:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E303D6048E;\n\tTue, 23 Nov 2021 23:40:29 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E92B660228\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 23 Nov 2021 23:40:21 +0100 (CET)","from Monstersaurus.ksquared.org.uk.beta.tailscale.net\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A6BFAF95;\n\tTue, 23 Nov 2021 23:40:21 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Ardpms/Q\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1637707221;\n\tbh=PfJPRRTvz3lFXnA9I2TlTN/N7fj1lAka5Kwf4Lbn2Ls=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Ardpms/QzwDaEwPxKLBL6a4ClV1cT6hxhIJcABMK2Ov5sR5gVFO0cYakWOgctv9v+\n\tr7LDBXZ8yg56xqu6/SRmvTxm8fO9k5sayHPCxW+AcinKOfelaP6TPOYSa4MI2F4Ht7\n\teTokKyGg7pFH35OcEvWf5vjwI4cPD1Q+LQMZhkEA=","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","To":"libcamera devel <libcamera-devel@lists.libcamera.org>","Date":"Tue, 23 Nov 2021 22:40:06 +0000","Message-Id":"<20211123224015.3619282-7-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","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 06/15] android: Convert to pragma once","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"Remove the verbose #ifndef/#define/#endif pattern for maintaining\nheader idempotency, and replace it with a simple #pragma once.\n\nThis simplifies the headers, and prevents redundant changes when\nheader files get moved.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n src/android/camera_buffer.h            | 5 ++---\n src/android/camera_capabilities.h      | 6 ++----\n src/android/camera_device.h            | 6 ++----\n src/android/camera_hal_config.h        | 5 ++---\n src/android/camera_hal_manager.h       | 6 ++----\n src/android/camera_metadata.h          | 6 ++----\n src/android/camera_ops.h               | 6 ++----\n src/android/camera_request.h           | 6 ++----\n src/android/camera_stream.h            | 6 ++----\n src/android/camera_worker.h            | 6 ++----\n src/android/jpeg/encoder.h             | 6 ++----\n src/android/jpeg/encoder_libjpeg.h     | 6 ++----\n src/android/jpeg/exif.h                | 6 ++----\n src/android/jpeg/post_processor_jpeg.h | 6 ++----\n src/android/jpeg/thumbnailer.h         | 6 ++----\n src/android/post_processor.h           | 6 ++----\n src/android/yuv/post_processor_yuv.h   | 6 ++----\n 17 files changed, 34 insertions(+), 66 deletions(-)","diff":"diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h\nindex 226a8f5c153b..b4531c800fdb 100644\n--- a/src/android/camera_buffer.h\n+++ b/src/android/camera_buffer.h\n@@ -4,8 +4,8 @@\n  *\n  * camera_buffer.h - Frame buffer handling interface definition\n  */\n-#ifndef __ANDROID_CAMERA_BUFFER_H__\n-#define __ANDROID_CAMERA_BUFFER_H__\n+\n+#pragma once\n \n #include <hardware/camera3.h>\n \n@@ -82,4 +82,3 @@ size_t CameraBuffer::jpegBufferSize(size_t maxJpegBufferSize) const\t\\\n {\t\t\t\t\t\t\t\t\t\\\n \treturn _d()->jpegBufferSize(maxJpegBufferSize);\t\t\t\\\n }\n-#endif /* __ANDROID_CAMERA_BUFFER_H__ */\ndiff --git a/src/android/camera_capabilities.h b/src/android/camera_capabilities.h\nindex 2cf97ae80095..6f66f221d33f 100644\n--- a/src/android/camera_capabilities.h\n+++ b/src/android/camera_capabilities.h\n@@ -4,8 +4,8 @@\n  *\n  * camera_capabilities.h - Camera static properties manager\n  */\n-#ifndef __ANDROID_CAMERA_CAPABILITIES_H__\n-#define __ANDROID_CAMERA_CAPABILITIES_H__\n+\n+#pragma once\n \n #include <map>\n #include <memory>\n@@ -84,5 +84,3 @@ private:\n \tstd::set<int32_t> availableRequestKeys_;\n \tstd::set<int32_t> availableResultKeys_;\n };\n-\n-#endif /* __ANDROID_CAMERA_CAPABILITIES_H__ */\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 2a414020f1ad..51fe7da2cb47 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -4,8 +4,8 @@\n  *\n  * camera_device.h - libcamera Android Camera Device\n  */\n-#ifndef __ANDROID_CAMERA_DEVICE_H__\n-#define __ANDROID_CAMERA_DEVICE_H__\n+\n+#pragma once\n \n #include <map>\n #include <memory>\n@@ -130,5 +130,3 @@ private:\n \n \tCameraMetadata lastSettings_;\n };\n-\n-#endif /* __ANDROID_CAMERA_DEVICE_H__ */\ndiff --git a/src/android/camera_hal_config.h b/src/android/camera_hal_config.h\nindex a79d5d6c42dc..9df554f9929b 100644\n--- a/src/android/camera_hal_config.h\n+++ b/src/android/camera_hal_config.h\n@@ -4,8 +4,8 @@\n  *\n  * camera_hal_config.h - Camera HAL configuration file manager\n  */\n-#ifndef __ANDROID_CAMERA_HAL_CONFIG_H__\n-#define __ANDROID_CAMERA_HAL_CONFIG_H__\n+\n+#pragma once\n \n #include <map>\n #include <string>\n@@ -36,4 +36,3 @@ private:\n \n \tint parseConfigurationFile();\n };\n-#endif /* __ANDROID_CAMERA_HAL_CONFIG_H__ */\ndiff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\nindex 3f6d302ad615..192f2fc56540 100644\n--- a/src/android/camera_hal_manager.h\n+++ b/src/android/camera_hal_manager.h\n@@ -4,8 +4,8 @@\n  *\n  * camera_hal_manager.h - libcamera Android Camera Manager\n  */\n-#ifndef __ANDROID_CAMERA_MANAGER_H__\n-#define __ANDROID_CAMERA_MANAGER_H__\n+\n+#pragma once\n \n #include <map>\n #include <mutex>\n@@ -69,5 +69,3 @@ private:\n \tunsigned int numInternalCameras_;\n \tunsigned int nextExternalCameraId_;\n };\n-\n-#endif /* __ANDROID_CAMERA_MANAGER_H__ */\ndiff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h\nindex 8555c7c3aaff..e70f60afdc01 100644\n--- a/src/android/camera_metadata.h\n+++ b/src/android/camera_metadata.h\n@@ -4,8 +4,8 @@\n  *\n  * camera_metadata.h - libcamera Android Camera Metadata Helper\n  */\n-#ifndef __ANDROID_CAMERA_METADATA_H__\n-#define __ANDROID_CAMERA_METADATA_H__\n+\n+#pragma once\n \n #include <stdint.h>\n #include <vector>\n@@ -99,5 +99,3 @@ private:\n \tbool valid_;\n \tbool resized_;\n };\n-\n-#endif /* __ANDROID_CAMERA_METADATA_H__ */\ndiff --git a/src/android/camera_ops.h b/src/android/camera_ops.h\nindex 304e7b856e81..b501bb7ef639 100644\n--- a/src/android/camera_ops.h\n+++ b/src/android/camera_ops.h\n@@ -4,12 +4,10 @@\n  *\n  * camera_ops.h - Android Camera HAL Operations\n  */\n-#ifndef __ANDROID_CAMERA_OPS_H__\n-#define __ANDROID_CAMERA_OPS_H__\n+\n+#pragma once\n \n #include <hardware/camera3.h>\n \n int hal_dev_close(hw_device_t *hw_device);\n extern camera3_device_ops hal_dev_ops;\n-\n-#endif /* __ANDROID_CAMERA_OPS_H__ */\ndiff --git a/src/android/camera_request.h b/src/android/camera_request.h\nindex 8d1204e5590b..f3cb6d643961 100644\n--- a/src/android/camera_request.h\n+++ b/src/android/camera_request.h\n@@ -4,8 +4,8 @@\n  *\n  * camera_request.h - libcamera Android Camera Request Descriptor\n  */\n-#ifndef __ANDROID_CAMERA_REQUEST_H__\n-#define __ANDROID_CAMERA_REQUEST_H__\n+\n+#pragma once\n \n #include <map>\n #include <memory>\n@@ -80,5 +80,3 @@ public:\n private:\n \tLIBCAMERA_DISABLE_COPY(Camera3RequestDescriptor)\n };\n-\n-#endif /* __ANDROID_CAMERA_REQUEST_H__ */\ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex 0c402deb4e8d..e9da75f0fed8 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -4,8 +4,8 @@\n  *\n  * camera_stream.h - Camera HAL stream\n  */\n-#ifndef __ANDROID_CAMERA_STREAM_H__\n-#define __ANDROID_CAMERA_STREAM_H__\n+\n+#pragma once\n \n #include <condition_variable>\n #include <memory>\n@@ -179,5 +179,3 @@ private:\n \n \tstd::unique_ptr<PostProcessorWorker> worker_;\n };\n-\n-#endif /* __ANDROID_CAMERA_STREAM__ */\ndiff --git a/src/android/camera_worker.h b/src/android/camera_worker.h\nindex c94f16325925..26ecc2732046 100644\n--- a/src/android/camera_worker.h\n+++ b/src/android/camera_worker.h\n@@ -4,8 +4,8 @@\n  *\n  * camera_worker.h - Process capture requests on behalf of the Camera HAL\n  */\n-#ifndef __ANDROID_CAMERA_WORKER_H__\n-#define __ANDROID_CAMERA_WORKER_H__\n+\n+#pragma once\n \n #include <memory>\n #include <stdint.h>\n@@ -68,5 +68,3 @@ private:\n \n \tWorker worker_;\n };\n-\n-#endif /* __ANDROID_CAMERA_WORKER_H__ */\ndiff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h\nindex a28522f41714..b974d367d8fa 100644\n--- a/src/android/jpeg/encoder.h\n+++ b/src/android/jpeg/encoder.h\n@@ -4,8 +4,8 @@\n  *\n  * encoder.h - Image encoding interface\n  */\n-#ifndef __ANDROID_JPEG_ENCODER_H__\n-#define __ANDROID_JPEG_ENCODER_H__\n+\n+#pragma once\n \n #include <libcamera/base/span.h>\n \n@@ -23,5 +23,3 @@ public:\n \t\t\t   libcamera::Span<const uint8_t> exifData,\n \t\t\t   unsigned int quality) = 0;\n };\n-\n-#endif /* __ANDROID_JPEG_ENCODER_H__ */\ndiff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\nindex 45ffbd7fae5d..1b3ac067a1c0 100644\n--- a/src/android/jpeg/encoder_libjpeg.h\n+++ b/src/android/jpeg/encoder_libjpeg.h\n@@ -4,8 +4,8 @@\n  *\n  * encoder_libjpeg.h - JPEG encoding using libjpeg\n  */\n-#ifndef __ANDROID_JPEG_ENCODER_LIBJPEG_H__\n-#define __ANDROID_JPEG_ENCODER_LIBJPEG_H__\n+\n+#pragma once\n \n #include \"encoder.h\"\n \n@@ -43,5 +43,3 @@ private:\n \tbool nv_;\n \tbool nvSwap_;\n };\n-\n-#endif /* __ANDROID_JPEG_ENCODER_LIBJPEG_H__ */\ndiff --git a/src/android/jpeg/exif.h b/src/android/jpeg/exif.h\nindex 23b0e0974459..2ff8fb78abce 100644\n--- a/src/android/jpeg/exif.h\n+++ b/src/android/jpeg/exif.h\n@@ -4,8 +4,8 @@\n  *\n  * exif.h - EXIF tag creator using libexif\n  */\n-#ifndef __ANDROID_JPEG_EXIF_H__\n-#define __ANDROID_JPEG_EXIF_H__\n+\n+#pragma once\n \n #include <chrono>\n #include <string>\n@@ -107,5 +107,3 @@ private:\n \tunsigned char *exifData_;\n \tunsigned int size_;\n };\n-\n-#endif /* __ANDROID_JPEG_EXIF_H__ */\ndiff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\nindex 43fcbe60bb26..98309b012a3b 100644\n--- a/src/android/jpeg/post_processor_jpeg.h\n+++ b/src/android/jpeg/post_processor_jpeg.h\n@@ -4,8 +4,8 @@\n  *\n  * post_processor_jpeg.h - JPEG Post Processor\n  */\n-#ifndef __ANDROID_POST_PROCESSOR_JPEG_H__\n-#define __ANDROID_POST_PROCESSOR_JPEG_H__\n+\n+#pragma once\n \n #include \"../post_processor.h\"\n #include \"encoder_libjpeg.h\"\n@@ -36,5 +36,3 @@ private:\n \tEncoderLibJpeg thumbnailEncoder_;\n \tThumbnailer thumbnailer_;\n };\n-\n-#endif /* __ANDROID_POST_PROCESSOR_JPEG_H__ */\ndiff --git a/src/android/jpeg/thumbnailer.h b/src/android/jpeg/thumbnailer.h\nindex 4d086c4943b0..d933cf0e31f1 100644\n--- a/src/android/jpeg/thumbnailer.h\n+++ b/src/android/jpeg/thumbnailer.h\n@@ -4,8 +4,8 @@\n  *\n  * thumbnailer.h - Simple image thumbnailer\n  */\n-#ifndef __ANDROID_JPEG_THUMBNAILER_H__\n-#define __ANDROID_JPEG_THUMBNAILER_H__\n+\n+#pragma once\n \n #include <libcamera/framebuffer.h>\n #include <libcamera/geometry.h>\n@@ -30,5 +30,3 @@ private:\n \n \tbool valid_;\n };\n-\n-#endif /* __ANDROID_JPEG_THUMBNAILER_H__ */\ndiff --git a/src/android/post_processor.h b/src/android/post_processor.h\nindex 5ec71c93f40a..1a205b05e842 100644\n--- a/src/android/post_processor.h\n+++ b/src/android/post_processor.h\n@@ -4,8 +4,8 @@\n  *\n  * post_processor.h - CameraStream Post Processing Interface\n  */\n-#ifndef __ANDROID_POST_PROCESSOR_H__\n-#define __ANDROID_POST_PROCESSOR_H__\n+\n+#pragma once\n \n #include <libcamera/base/signal.h>\n \n@@ -31,5 +31,3 @@ public:\n \n \tlibcamera::Signal<Camera3RequestDescriptor::StreamBuffer *, Status> processComplete;\n };\n-\n-#endif /* __ANDROID_POST_PROCESSOR_H__ */\ndiff --git a/src/android/yuv/post_processor_yuv.h b/src/android/yuv/post_processor_yuv.h\nindex 39ec7994c0c0..a7ac17c564b6 100644\n--- a/src/android/yuv/post_processor_yuv.h\n+++ b/src/android/yuv/post_processor_yuv.h\n@@ -4,8 +4,8 @@\n  *\n  * post_processor_yuv.h - Post Processor using libyuv\n  */\n-#ifndef __ANDROID_POST_PROCESSOR_YUV_H__\n-#define __ANDROID_POST_PROCESSOR_YUV_H__\n+\n+#pragma once\n \n #include \"../post_processor.h\"\n \n@@ -33,5 +33,3 @@ private:\n \tunsigned int sourceStride_[2] = {};\n \tunsigned int destinationStride_[2] = {};\n };\n-\n-#endif /* __ANDROID_POST_PROCESSOR_YUV_H__ */\n","prefixes":["libcamera-devel","06/15"]}