diff options
author | Jacques Lucke <jacques@blender.org> | 2020-08-07 10:50:34 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-08-07 10:50:34 +0300 |
commit | 91694b9b58ab953f3b313be9389cc1303e472fc2 (patch) | |
tree | ae4608d519dd0a46801532630c25298bea619d7b /source/blender/functions | |
parent | 58909abc685bf9ba33e8ed041ef7ff02f170bcdc (diff) |
Code Style: use "#pragma once" in source directory
This replaces header include guards with `#pragma once`.
A couple of include guards are not removed yet (e.g. `__RNA_TYPES_H__`),
because they are used in other places.
This patch has been generated by P1561 followed by `make format`.
Differential Revision: https://developer.blender.org/D8466
Diffstat (limited to 'source/blender/functions')
15 files changed, 15 insertions, 60 deletions
diff --git a/source/blender/functions/FN_array_spans.hh b/source/blender/functions/FN_array_spans.hh index c362fef3630..52325c19c1b 100644 --- a/source/blender/functions/FN_array_spans.hh +++ b/source/blender/functions/FN_array_spans.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FN_ARRAY_SPANS_HH__ -#define __FN_ARRAY_SPANS_HH__ +#pragma once /** \file * \ingroup fn @@ -205,5 +204,3 @@ class GVArraySpan : public VArraySpanBase<void> { }; } // namespace blender::fn - -#endif /* __FN_ARRAY_SPANS_HH__ */ diff --git a/source/blender/functions/FN_attributes_ref.hh b/source/blender/functions/FN_attributes_ref.hh index ed14676731e..fe7e59b5e00 100644 --- a/source/blender/functions/FN_attributes_ref.hh +++ b/source/blender/functions/FN_attributes_ref.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FN_ATTRIBUTES_REF_HH__ -#define __FN_ATTRIBUTES_REF_HH__ +#pragma once /** \file * \ingroup fn @@ -340,5 +339,3 @@ class AttributesRef { }; } // namespace blender::fn - -#endif /* __FN_ATTRIBUTES_REF_HH__ */ diff --git a/source/blender/functions/FN_cpp_type.hh b/source/blender/functions/FN_cpp_type.hh index 594890e353a..1176a705e66 100644 --- a/source/blender/functions/FN_cpp_type.hh +++ b/source/blender/functions/FN_cpp_type.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FN_CPP_TYPE_HH__ -#define __FN_CPP_TYPE_HH__ +#pragma once /** \file * \ingroup fn @@ -795,5 +794,3 @@ inline std::unique_ptr<const CPPType> create_cpp_type(StringRef name, const T &d STRINGIFY(IDENTIFIER), default_value); \ return *cpp_type; \ } - -#endif /* __FN_CPP_TYPE_HH__ */ diff --git a/source/blender/functions/FN_generic_vector_array.hh b/source/blender/functions/FN_generic_vector_array.hh index ee67db000e5..0a173d1fbc6 100644 --- a/source/blender/functions/FN_generic_vector_array.hh +++ b/source/blender/functions/FN_generic_vector_array.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FN_GENERIC_VECTOR_ARRAY_HH__ -#define __FN_GENERIC_VECTOR_ARRAY_HH__ +#pragma once /** \file * \ingroup fn @@ -202,5 +201,3 @@ template<typename T> class GVectorArrayRef { }; } // namespace blender::fn - -#endif /* __FN_GENERIC_VECTOR_ARRAY_HH__ */ diff --git a/source/blender/functions/FN_multi_function.hh b/source/blender/functions/FN_multi_function.hh index eaddcee7964..bf431984946 100644 --- a/source/blender/functions/FN_multi_function.hh +++ b/source/blender/functions/FN_multi_function.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FN_MULTI_FUNCTION_HH__ -#define __FN_MULTI_FUNCTION_HH__ +#pragma once /** \file * \ingroup fn @@ -124,5 +123,3 @@ inline MFParamsBuilder::MFParamsBuilder(const class MultiFunction &fn, int64_t m extern const MultiFunction &dummy_multi_function; } // namespace blender::fn - -#endif /* __FN_MULTI_FUNCTION_HH__ */ diff --git a/source/blender/functions/FN_multi_function_builder.hh b/source/blender/functions/FN_multi_function_builder.hh index 95e216558e7..dee0938eb3a 100644 --- a/source/blender/functions/FN_multi_function_builder.hh +++ b/source/blender/functions/FN_multi_function_builder.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FN_MULTI_FUNCTION_BUILDER_HH__ -#define __FN_MULTI_FUNCTION_BUILDER_HH__ +#pragma once /** \file * \ingroup fn @@ -314,5 +313,3 @@ class CustomMF_DefaultOutput : public MultiFunction { }; } // namespace blender::fn - -#endif /* __FN_MULTI_FUNCTION_BUILDER_HH__ */ diff --git a/source/blender/functions/FN_multi_function_context.hh b/source/blender/functions/FN_multi_function_context.hh index 8492fd86742..eec6b21ae7c 100644 --- a/source/blender/functions/FN_multi_function_context.hh +++ b/source/blender/functions/FN_multi_function_context.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FN_MULTI_FUNCTION_CONTEXT_HH__ -#define __FN_MULTI_FUNCTION_CONTEXT_HH__ +#pragma once /** \file * \ingroup fn @@ -66,5 +65,3 @@ class MFContext { }; } // namespace blender::fn - -#endif /* __FN_MULTI_FUNCTION_CONTEXT_HH__ */ diff --git a/source/blender/functions/FN_multi_function_data_type.hh b/source/blender/functions/FN_multi_function_data_type.hh index 23a1c0e5680..34997703432 100644 --- a/source/blender/functions/FN_multi_function_data_type.hh +++ b/source/blender/functions/FN_multi_function_data_type.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FN_MULTI_FUNCTION_DATA_TYPE_HH__ -#define __FN_MULTI_FUNCTION_DATA_TYPE_HH__ +#pragma once /** \file * \ingroup fn @@ -126,5 +125,3 @@ inline bool operator!=(const MFDataType &a, const MFDataType &b) } } // namespace blender::fn - -#endif /* __FN_MULTI_FUNCTION_DATA_TYPE_HH__ */ diff --git a/source/blender/functions/FN_multi_function_network.hh b/source/blender/functions/FN_multi_function_network.hh index 20f8fb2ee43..7a9f5b4cfaf 100644 --- a/source/blender/functions/FN_multi_function_network.hh +++ b/source/blender/functions/FN_multi_function_network.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FN_MULTI_FUNCTION_NETWORK_HH__ -#define __FN_MULTI_FUNCTION_NETWORK_HH__ +#pragma once /** \file * \ingroup fn @@ -535,5 +534,3 @@ inline int MFNetwork::node_id_amount() const } } // namespace blender::fn - -#endif /* __FN_MULTI_FUNCTION_NETWORK_HH__ */ diff --git a/source/blender/functions/FN_multi_function_network_evaluation.hh b/source/blender/functions/FN_multi_function_network_evaluation.hh index 11606869ca2..2c0d94615b0 100644 --- a/source/blender/functions/FN_multi_function_network_evaluation.hh +++ b/source/blender/functions/FN_multi_function_network_evaluation.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FN_MULTI_FUNCTION_NETWORK_EVALUATION_HH__ -#define __FN_MULTI_FUNCTION_NETWORK_EVALUATION_HH__ +#pragma once /** \file * \ingroup fn @@ -60,5 +59,3 @@ class MFNetworkEvaluator : public MultiFunction { }; } // namespace blender::fn - -#endif /* __FN_MULTI_FUNCTION_NETWORK_EVALUATION_HH__ */ diff --git a/source/blender/functions/FN_multi_function_network_optimization.hh b/source/blender/functions/FN_multi_function_network_optimization.hh index 3cbabd72c2a..6d0165643ce 100644 --- a/source/blender/functions/FN_multi_function_network_optimization.hh +++ b/source/blender/functions/FN_multi_function_network_optimization.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FN_MULTI_FUNCTION_NETWORK_OPTIMIZATION_HH__ -#define __FN_MULTI_FUNCTION_NETWORK_OPTIMIZATION_HH__ +#pragma once #include "FN_multi_function_network.hh" @@ -28,5 +27,3 @@ void constant_folding(MFNetwork &network, ResourceCollector &resources); void common_subnetwork_elimination(MFNetwork &network); } // namespace blender::fn::mf_network_optimization - -#endif /* __FN_MULTI_FUNCTION_NETWORK_OPTIMIZATION_HH__ */ diff --git a/source/blender/functions/FN_multi_function_param_type.hh b/source/blender/functions/FN_multi_function_param_type.hh index 7c16b8cdf10..5b35cbe365b 100644 --- a/source/blender/functions/FN_multi_function_param_type.hh +++ b/source/blender/functions/FN_multi_function_param_type.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FN_MULTI_FUNCTION_PARAM_TYPE_HH__ -#define __FN_MULTI_FUNCTION_PARAM_TYPE_HH__ +#pragma once /** \file * \ingroup fn @@ -164,5 +163,3 @@ inline bool operator!=(const MFParamType &a, const MFParamType &b) } } // namespace blender::fn - -#endif /* __FN_MULTI_FUNCTION_PARAM_TYPE_HH__ */ diff --git a/source/blender/functions/FN_multi_function_params.hh b/source/blender/functions/FN_multi_function_params.hh index 93d7b47af83..71b05754717 100644 --- a/source/blender/functions/FN_multi_function_params.hh +++ b/source/blender/functions/FN_multi_function_params.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FN_MULTI_FUNCTION_PARAMS_HH__ -#define __FN_MULTI_FUNCTION_PARAMS_HH__ +#pragma once /** \file * \ingroup fn @@ -237,5 +236,3 @@ class MFParams { }; } // namespace blender::fn - -#endif /* __FN_MULTI_FUNCTION_PARAMS_HH__ */ diff --git a/source/blender/functions/FN_multi_function_signature.hh b/source/blender/functions/FN_multi_function_signature.hh index ba79dddff16..fd92bb2ff55 100644 --- a/source/blender/functions/FN_multi_function_signature.hh +++ b/source/blender/functions/FN_multi_function_signature.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FN_MULTI_FUNCTION_SIGNATURE_HH__ -#define __FN_MULTI_FUNCTION_SIGNATURE_HH__ +#pragma once /** \file * \ingroup fn @@ -170,5 +169,3 @@ class MFSignatureBuilder { }; } // namespace blender::fn - -#endif /* __FN_MULTI_FUNCTION_SIGNATURE_HH__ */ diff --git a/source/blender/functions/FN_spans.hh b/source/blender/functions/FN_spans.hh index d8b381199cc..3ceb78ea6bd 100644 --- a/source/blender/functions/FN_spans.hh +++ b/source/blender/functions/FN_spans.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FN_SPANS_HH__ -#define __FN_SPANS_HH__ +#pragma once /** \file * \ingroup fn @@ -412,5 +411,3 @@ class GVSpan : public VSpanBase<void> { }; } // namespace blender::fn - -#endif /* __FN_SPANS_HH__ */ |