[libcamera-devel] [PATCH 14/15] utils: Convert to pragma once
Kieran Bingham
kieran.bingham at ideasonboard.com
Tue Nov 23 23:40:14 CET 2021
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 <kieran.bingham at ideasonboard.com>
---
utils/gen-header.sh | 9 ++-------
.../libcamera_templates/core_ipa_interface.h.tmpl | 5 +----
.../libcamera_templates/core_ipa_serializer.h.tmpl | 5 +----
.../libcamera_templates/module_ipa_interface.h.tmpl | 5 +----
.../libcamera_templates/module_ipa_proxy.h.tmpl | 5 +----
.../libcamera_templates/module_ipa_serializer.h.tmpl | 5 +----
6 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/utils/gen-header.sh b/utils/gen-header.sh
index fcb9c5e16d07..8b66c5dd0f47 100755
--- a/utils/gen-header.sh
+++ b/utils/gen-header.sh
@@ -11,8 +11,8 @@ cat <<EOF > "$dst_file"
*
* libcamera.h - libcamera public API
*/
-#ifndef __LIBCAMERA_LIBCAMERA_H__
-#define __LIBCAMERA_LIBCAMERA_H__
+
+#pragma once
EOF
@@ -25,8 +25,3 @@ done | sort)
for header in $headers ; do
echo "#include <libcamera/$header>" >> "$dst_file"
done
-
-cat <<EOF >> "$dst_file"
-
-#endif /* __LIBCAMERA_LIBCAMERA_H__ */
-EOF
diff --git a/utils/ipc/generators/libcamera_templates/core_ipa_interface.h.tmpl b/utils/ipc/generators/libcamera_templates/core_ipa_interface.h.tmpl
index 6bf6094b9456..a565b59ada25 100644
--- a/utils/ipc/generators/libcamera_templates/core_ipa_interface.h.tmpl
+++ b/utils/ipc/generators/libcamera_templates/core_ipa_interface.h.tmpl
@@ -12,8 +12,7 @@
* This file is auto-generated. Do not edit.
*/
-#ifndef __LIBCAMERA_IPA_INTERFACE_CORE_GENERATED_H__
-#define __LIBCAMERA_IPA_INTERFACE_CORE_GENERATED_H__
+#pragma once
{% if has_map %}#include <map>{% endif %}
{% if has_array %}#include <vector>{% endif %}
@@ -36,5 +35,3 @@ static const {{const.kind|name}} {{const.mojom_name}} = {{const.value}};
{% endfor %}
} /* namespace libcamera */
-
-#endif /* __LIBCAMERA_IPA_INTERFACE_CORE_GENERATED_H__ */
diff --git a/utils/ipc/generators/libcamera_templates/core_ipa_serializer.h.tmpl b/utils/ipc/generators/libcamera_templates/core_ipa_serializer.h.tmpl
index 37a784f1f940..5738a1aa3405 100644
--- a/utils/ipc/generators/libcamera_templates/core_ipa_serializer.h.tmpl
+++ b/utils/ipc/generators/libcamera_templates/core_ipa_serializer.h.tmpl
@@ -13,8 +13,7 @@
* This file is auto-generated. Do not edit.
*/
-#ifndef __LIBCAMERA_INTERNAL_IPA_DATA_SERIALIZER_CORE_H__
-#define __LIBCAMERA_INTERNAL_IPA_DATA_SERIALIZER_CORE_H__
+#pragma once
#include <tuple>
#include <vector>
@@ -43,5 +42,3 @@ public:
{% endfor %}
} /* namespace libcamera */
-
-#endif /* __LIBCAMERA_INTERNAL_IPA_DATA_SERIALIZER_CORE_H__ */
diff --git a/utils/ipc/generators/libcamera_templates/module_ipa_interface.h.tmpl b/utils/ipc/generators/libcamera_templates/module_ipa_interface.h.tmpl
index ebe811fa1028..415ec283895c 100644
--- a/utils/ipc/generators/libcamera_templates/module_ipa_interface.h.tmpl
+++ b/utils/ipc/generators/libcamera_templates/module_ipa_interface.h.tmpl
@@ -12,8 +12,7 @@
* This file is auto-generated. Do not edit.
*/
-#ifndef __LIBCAMERA_IPA_INTERFACE_{{module_name|upper}}_GENERATED_H__
-#define __LIBCAMERA_IPA_INTERFACE_{{module_name|upper}}_GENERATED_H__
+#pragma once
#include <libcamera/ipa/core_ipa_interface.h>
#include <libcamera/ipa/ipa_interface.h>
@@ -83,5 +82,3 @@ public:
{% endfor %}
{%- endif %}
} /* namespace libcamera */
-
-#endif /* __LIBCAMERA_IPA_INTERFACE_{{module_name|upper}}_GENERATED_H__ */
diff --git a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl
index 1979e68ff74d..ce396c183d0c 100644
--- a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl
+++ b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl
@@ -13,8 +13,7 @@
* This file is auto-generated. Do not edit.
*/
-#ifndef __LIBCAMERA_INTERNAL_IPA_PROXY_{{module_name|upper}}_H__
-#define __LIBCAMERA_INTERNAL_IPA_PROXY_{{module_name|upper}}_H__
+#pragma once
#include <libcamera/ipa/ipa_interface.h>
#include <libcamera/ipa/{{module_name}}_ipa_interface.h>
@@ -130,5 +129,3 @@ private:
{% endfor %}
{%- endif %}
} /* namespace libcamera */
-
-#endif /* __LIBCAMERA_INTERNAL_IPA_PROXY_{{module_name|upper}}_H__ */
diff --git a/utils/ipc/generators/libcamera_templates/module_ipa_serializer.h.tmpl b/utils/ipc/generators/libcamera_templates/module_ipa_serializer.h.tmpl
index 779d2114f9f3..8b709705aa32 100644
--- a/utils/ipc/generators/libcamera_templates/module_ipa_serializer.h.tmpl
+++ b/utils/ipc/generators/libcamera_templates/module_ipa_serializer.h.tmpl
@@ -13,8 +13,7 @@
* This file is auto-generated. Do not edit.
*/
-#ifndef __LIBCAMERA_INTERNAL_IPA_DATA_SERIALIZER_{{module_name|upper}}_H__
-#define __LIBCAMERA_INTERNAL_IPA_DATA_SERIALIZER_{{module_name|upper}}_H__
+#pragma once
#include <tuple>
#include <vector>
@@ -44,5 +43,3 @@ public:
{% endfor %}
} /* namespace libcamera */
-
-#endif /* __LIBCAMERA_INTERNAL_IPA_DATA_SERIALIZER_{{module_name|upper}}_H__ */
--
2.30.2
More information about the libcamera-devel
mailing list