{"id":14733,"url":"https://patchwork.libcamera.org/api/1.1/patches/14733/?format=json","web_url":"https://patchwork.libcamera.org/patch/14733/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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-3-kieran.bingham@ideasonboard.com>","date":"2021-11-23T22:40:02","name":"[libcamera-devel,02/15] libcamera: base: Convert to pragma once","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"3b1a6aea6eb0558056e6b8c0839a728d45cd7e43","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":{"id":11,"url":"https://patchwork.libcamera.org/api/1.1/users/11/?format=json","username":"kbingham","first_name":"Kieran","last_name":"Bingham","email":"kieran.bingham@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/14733/mbox/","series":[{"id":2749,"url":"https://patchwork.libcamera.org/api/1.1/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/14733/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14733/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 DAC84BF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 23 Nov 2021 22:40:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5376A6044F;\n\tTue, 23 Nov 2021 23:40:25 +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 118E16022F\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 B5AED11BB;\n\tTue, 23 Nov 2021 23:40:20 +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=\"I7VWa2FV\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1637707220;\n\tbh=fNdOA1N28Kg6wXlD0ZGWmUQVsd6EhqpWsmYvScBncYU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=I7VWa2FV8fOpRUGjHb+zyqXBzCXtfhpMKpt4P9ZtIavRmuy3/h8A4yyAfDesbhoq+\n\tOr9su/mUzGPKqSpk0Mpzu8j/xyp/U6AlljDw6JMDd6pfmVF8DnlTcxdLLMXFBTxB6j\n\toNHSIqn6oIBHiF6yQp4218xUOyGSfQvUuzEcP2Uo=","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","To":"libcamera devel <libcamera-devel@lists.libcamera.org>","Date":"Tue, 23 Nov 2021 22:40:02 +0000","Message-Id":"<20211123224015.3619282-3-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 02/15] libcamera: base: Convert to pragma\n\tonce","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 include/libcamera/base/backtrace.h             | 6 ++----\n include/libcamera/base/bound_method.h          | 6 ++----\n include/libcamera/base/class.h                 | 6 ++----\n include/libcamera/base/event_dispatcher.h      | 6 ++----\n include/libcamera/base/event_dispatcher_poll.h | 6 ++----\n include/libcamera/base/event_notifier.h        | 6 ++----\n include/libcamera/base/file.h                  | 6 ++----\n include/libcamera/base/flags.h                 | 6 ++----\n include/libcamera/base/log.h                   | 6 ++----\n include/libcamera/base/message.h               | 6 ++----\n include/libcamera/base/object.h                | 6 ++----\n include/libcamera/base/semaphore.h             | 6 ++----\n include/libcamera/base/signal.h                | 6 ++----\n include/libcamera/base/span.h                  | 5 +----\n include/libcamera/base/thread.h                | 6 ++----\n include/libcamera/base/timer.h                 | 6 ++----\n include/libcamera/base/utils.h                 | 6 ++----\n 17 files changed, 33 insertions(+), 68 deletions(-)","diff":"diff --git a/include/libcamera/base/backtrace.h b/include/libcamera/base/backtrace.h\nindex bb77c73b67e3..752034d140e8 100644\n--- a/include/libcamera/base/backtrace.h\n+++ b/include/libcamera/base/backtrace.h\n@@ -4,8 +4,8 @@\n  *\n  * backtrace.h - Call stack backtraces\n  */\n-#ifndef __LIBCAMERA_BASE_BACKTRACE_H__\n-#define __LIBCAMERA_BASE_BACKTRACE_H__\n+\n+#pragma once\n \n #include <string>\n #include <vector>\n@@ -34,5 +34,3 @@ private:\n };\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_BACKTRACE_H__ */\ndiff --git a/include/libcamera/base/bound_method.h b/include/libcamera/base/bound_method.h\nindex ebd297ab8209..e73a4d98ddae 100644\n--- a/include/libcamera/base/bound_method.h\n+++ b/include/libcamera/base/bound_method.h\n@@ -4,8 +4,8 @@\n  *\n  * bound_method.h - Method bind and invocation\n  */\n-#ifndef __LIBCAMERA_BASE_BOUND_METHOD_H__\n-#define __LIBCAMERA_BASE_BOUND_METHOD_H__\n+\n+#pragma once\n \n #include <memory>\n #include <tuple>\n@@ -222,5 +222,3 @@ private:\n };\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_BOUND_METHOD_H__ */\ndiff --git a/include/libcamera/base/class.h b/include/libcamera/base/class.h\nindex 09806cd723c0..571eecf4da50 100644\n--- a/include/libcamera/base/class.h\n+++ b/include/libcamera/base/class.h\n@@ -4,8 +4,8 @@\n  *\n  * class.h - Utilities and helpers for classes\n  */\n-#ifndef __LIBCAMERA_BASE_CLASS_H__\n-#define __LIBCAMERA_BASE_CLASS_H__\n+\n+#pragma once\n \n #include <memory>\n \n@@ -107,5 +107,3 @@ private:\n };\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_CLASS_H__ */\ndiff --git a/include/libcamera/base/event_dispatcher.h b/include/libcamera/base/event_dispatcher.h\nindex 825af7a33919..184f1b12c966 100644\n--- a/include/libcamera/base/event_dispatcher.h\n+++ b/include/libcamera/base/event_dispatcher.h\n@@ -4,8 +4,8 @@\n  *\n  * event_dispatcher.h - Event dispatcher\n  */\n-#ifndef __LIBCAMERA_BASE_EVENT_DISPATCHER_H__\n-#define __LIBCAMERA_BASE_EVENT_DISPATCHER_H__\n+\n+#pragma once\n \n #include <vector>\n \n@@ -33,5 +33,3 @@ public:\n };\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_EVENT_DISPATCHER_H__ */\ndiff --git a/include/libcamera/base/event_dispatcher_poll.h b/include/libcamera/base/event_dispatcher_poll.h\nindex 683934bfc7f7..3d2fc7bbc4c3 100644\n--- a/include/libcamera/base/event_dispatcher_poll.h\n+++ b/include/libcamera/base/event_dispatcher_poll.h\n@@ -4,8 +4,8 @@\n  *\n  * event_dispatcher_poll.h - Poll-based event dispatcher\n  */\n-#ifndef __LIBCAMERA_BASE_EVENT_DISPATCHER_POLL_H__\n-#define __LIBCAMERA_BASE_EVENT_DISPATCHER_POLL_H__\n+\n+#pragma once\n \n #include <list>\n #include <map>\n@@ -56,5 +56,3 @@ private:\n };\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_EVENT_DISPATCHER_POLL_H__ */\ndiff --git a/include/libcamera/base/event_notifier.h b/include/libcamera/base/event_notifier.h\nindex f7722a32ef55..e5c0594d3ebd 100644\n--- a/include/libcamera/base/event_notifier.h\n+++ b/include/libcamera/base/event_notifier.h\n@@ -4,8 +4,8 @@\n  *\n  * event_notifier.h - File descriptor event notifier\n  */\n-#ifndef __LIBCAMERA_BASE_EVENT_NOTIFIER_H__\n-#define __LIBCAMERA_BASE_EVENT_NOTIFIER_H__\n+\n+#pragma once\n \n #include <libcamera/base/private.h>\n \n@@ -46,5 +46,3 @@ private:\n };\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_EVENT_NOTIFIER_H__ */\ndiff --git a/include/libcamera/base/file.h b/include/libcamera/base/file.h\nindex 60851d385587..55e8edd934d4 100644\n--- a/include/libcamera/base/file.h\n+++ b/include/libcamera/base/file.h\n@@ -4,8 +4,8 @@\n  *\n  * file.h - File I/O operations\n  */\n-#ifndef __LIBCAMERA_BASE_FILE_H__\n-#define __LIBCAMERA_BASE_FILE_H__\n+\n+#pragma once\n \n #include <sys/types.h>\n \n@@ -84,5 +84,3 @@ LIBCAMERA_FLAGS_ENABLE_OPERATORS(File::MapFlag)\n LIBCAMERA_FLAGS_ENABLE_OPERATORS(File::OpenModeFlag)\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_FILE_H__ */\ndiff --git a/include/libcamera/base/flags.h b/include/libcamera/base/flags.h\nindex adec549dccc9..bff3b93c85a1 100644\n--- a/include/libcamera/base/flags.h\n+++ b/include/libcamera/base/flags.h\n@@ -4,8 +4,8 @@\n  *\n  * flags.h - Type-safe enum-based bitfields\n  */\n-#ifndef __LIBCAMERA_BASE_FLAGS_H__\n-#define __LIBCAMERA_BASE_FLAGS_H__\n+\n+#pragma once\n \n #include <type_traits>\n \n@@ -191,5 +191,3 @@ struct flags_enable_operators<_enum> {\t\t\t\t\t\\\n #endif /* __DOXYGEN__ */\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_FLAGS_H__ */\ndiff --git a/include/libcamera/base/log.h b/include/libcamera/base/log.h\nindex 866a2133523b..3f065267c914 100644\n--- a/include/libcamera/base/log.h\n+++ b/include/libcamera/base/log.h\n@@ -4,8 +4,8 @@\n  *\n  * log.h - Logging infrastructure\n  */\n-#ifndef __LIBCAMERA_BASE_LOG_H__\n-#define __LIBCAMERA_BASE_LOG_H__\n+\n+#pragma once\n \n #include <chrono>\n #include <sstream>\n@@ -128,5 +128,3 @@ LogMessage _log(const LogCategory *category, LogSeverity severity,\n #endif\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_LOG_H__ */\ndiff --git a/include/libcamera/base/message.h b/include/libcamera/base/message.h\nindex 5d2a9f04f0a7..65572c7470e9 100644\n--- a/include/libcamera/base/message.h\n+++ b/include/libcamera/base/message.h\n@@ -4,8 +4,8 @@\n  *\n  * message.h - Message queue support\n  */\n-#ifndef __LIBCAMERA_BASE_MESSAGE_H__\n-#define __LIBCAMERA_BASE_MESSAGE_H__\n+\n+#pragma once\n \n #include <atomic>\n \n@@ -67,5 +67,3 @@ private:\n };\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_MESSAGE_H__ */\ndiff --git a/include/libcamera/base/object.h b/include/libcamera/base/object.h\nindex 5c385ab4b140..25dcbc0483d0 100644\n--- a/include/libcamera/base/object.h\n+++ b/include/libcamera/base/object.h\n@@ -4,8 +4,8 @@\n  *\n  * object.h - Base object\n  */\n-#ifndef __LIBCAMERA_BASE_OBJECT_H__\n-#define __LIBCAMERA_BASE_OBJECT_H__\n+\n+#pragma once\n \n #include <list>\n #include <memory>\n@@ -67,5 +67,3 @@ private:\n };\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_OBJECT_H__ */\ndiff --git a/include/libcamera/base/semaphore.h b/include/libcamera/base/semaphore.h\nindex d8146eb8060b..ae87d31916dc 100644\n--- a/include/libcamera/base/semaphore.h\n+++ b/include/libcamera/base/semaphore.h\n@@ -4,8 +4,8 @@\n  *\n  * semaphore.h - General-purpose counting semaphore\n  */\n-#ifndef __LIBCAMERA_BASE_SEMAPHORE_H__\n-#define __LIBCAMERA_BASE_SEMAPHORE_H__\n+\n+#pragma once\n \n #include <condition_variable>\n \n@@ -31,5 +31,3 @@ private:\n };\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_SEMAPHORE_H__ */\ndiff --git a/include/libcamera/base/signal.h b/include/libcamera/base/signal.h\nindex 8d9f82f62d0d..91000d0d6349 100644\n--- a/include/libcamera/base/signal.h\n+++ b/include/libcamera/base/signal.h\n@@ -4,8 +4,8 @@\n  *\n  * signal.h - Signal & slot implementation\n  */\n-#ifndef __LIBCAMERA_BASE_SIGNAL_H__\n-#define __LIBCAMERA_BASE_SIGNAL_H__\n+\n+#pragma once\n \n #include <functional>\n #include <list>\n@@ -147,5 +147,3 @@ public:\n };\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_SIGNAL_H__ */\ndiff --git a/include/libcamera/base/span.h b/include/libcamera/base/span.h\nindex 21099d5611b8..88d2e3de3a6b 100644\n--- a/include/libcamera/base/span.h\n+++ b/include/libcamera/base/span.h\n@@ -5,8 +5,7 @@\n  * span.h - C++20 std::span<> implementation for C++11\n  */\n \n-#ifndef __LIBCAMERA_BASE_SPAN_H__\n-#define __LIBCAMERA_BASE_SPAN_H__\n+#pragma once\n \n #include <array>\n #include <iterator>\n@@ -420,5 +419,3 @@ private:\n };\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_SPAN_H__ */\ndiff --git a/include/libcamera/base/thread.h b/include/libcamera/base/thread.h\nindex e0ca0aeaa761..32ebc80a0eb9 100644\n--- a/include/libcamera/base/thread.h\n+++ b/include/libcamera/base/thread.h\n@@ -4,8 +4,8 @@\n  *\n  * thread.h - Thread support\n  */\n-#ifndef __LIBCAMERA_BASE_THREAD_H__\n-#define __LIBCAMERA_BASE_THREAD_H__\n+\n+#pragma once\n \n #include <memory>\n #include <mutex>\n@@ -74,5 +74,3 @@ private:\n };\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_THREAD_H__ */\ndiff --git a/include/libcamera/base/timer.h b/include/libcamera/base/timer.h\nindex 44876a85dc0a..09f1d3229bd5 100644\n--- a/include/libcamera/base/timer.h\n+++ b/include/libcamera/base/timer.h\n@@ -4,8 +4,8 @@\n  *\n  * timer.h - Generic timer\n  */\n-#ifndef __LIBCAMERA_BASE_TIMER_H__\n-#define __LIBCAMERA_BASE_TIMER_H__\n+\n+#pragma once\n \n #include <chrono>\n #include <stdint.h>\n@@ -47,5 +47,3 @@ private:\n };\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_TIMER_H__ */\ndiff --git a/include/libcamera/base/utils.h b/include/libcamera/base/utils.h\nindex 2b761436a99f..3a803176693d 100644\n--- a/include/libcamera/base/utils.h\n+++ b/include/libcamera/base/utils.h\n@@ -4,8 +4,8 @@\n  *\n  * utils.h - Miscellaneous utility functions\n  */\n-#ifndef __LIBCAMERA_BASE_UTILS_H__\n-#define __LIBCAMERA_BASE_UTILS_H__\n+\n+#pragma once\n \n #include <algorithm>\n #include <chrono>\n@@ -355,5 +355,3 @@ std::basic_ostream<CharT, Traits> &operator<<(std::basic_ostream<CharT, Traits>\n #endif\n \n } /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_BASE_UTILS_H__ */\n","prefixes":["libcamera-devel","02/15"]}