diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:10:37 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:10:37 +0300 |
| commit | 8198dbb888856b8c11757586df02aca15f132f90 (patch) | |
| tree | 4f45fa32597bd0baece7f334182e5371e926af7d | |
| parent | af88cc0701c8562a4b594075e4603b7176e117ba (diff) | |
Code Style: use "#pragma once" in some newer headers
Those were missing from the previous commit, because these headers
only exist in the `master` and not in the `blender-v2.90-release` branch.
5 files changed, 5 insertions, 20 deletions
diff --git a/source/blender/blenlib/BLI_multi_value_map.hh b/source/blender/blenlib/BLI_multi_value_map.hh index c20c4ef9677..018f080e633 100644 --- a/source/blender/blenlib/BLI_multi_value_map.hh +++ b/source/blender/blenlib/BLI_multi_value_map.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_MULTI_VALUE_MAP_HH__ -#define __BLI_MULTI_VALUE_MAP_HH__ +#pragma once /** \file * \ingroup bli @@ -130,5 +129,3 @@ template<typename Key, typename Value> class MultiValueMap { }; } // namespace blender - -#endif /* __BLI_MULTI_VALUE_MAP_HH__ */ diff --git a/source/blender/blenlib/BLI_vector_adaptor.hh b/source/blender/blenlib/BLI_vector_adaptor.hh index cadffc0b445..9c805f242e4 100644 --- a/source/blender/blenlib/BLI_vector_adaptor.hh +++ b/source/blender/blenlib/BLI_vector_adaptor.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_VECTOR_ADAPTOR_HH__ -#define __BLI_VECTOR_ADAPTOR_HH__ +#pragma once /** \file * \ingroup bli @@ -101,5 +100,3 @@ template<typename T> class VectorAdaptor { }; } // namespace blender - -#endif /* __BLI_VECTOR_ADAPTOR_HH__ */ diff --git a/source/blender/nodes/NOD_node_tree_dependencies.hh b/source/blender/nodes/NOD_node_tree_dependencies.hh index ca7059caa5f..13bb2bde2f3 100644 --- a/source/blender/nodes/NOD_node_tree_dependencies.hh +++ b/source/blender/nodes/NOD_node_tree_dependencies.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __NOD_NODE_TREE_DEPENDENCIES_H__ -#define __NOD_NODE_TREE_DEPENDENCIES_H__ +#pragma once #include "BLI_vector_set.hh" @@ -75,5 +74,3 @@ class NodeTreeDependencies { NodeTreeDependencies find_node_tree_dependencies(bNodeTree &ntree); } // namespace blender::nodes - -#endif /* __NOD_NODE_TREE_DEPENDENCIES_H__ */ diff --git a/source/blender/simulation/intern/particle_mesh_emitter.hh b/source/blender/simulation/intern/particle_mesh_emitter.hh index 724d79c1aec..cdcf2a34e16 100644 --- a/source/blender/simulation/intern/particle_mesh_emitter.hh +++ b/source/blender/simulation/intern/particle_mesh_emitter.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __SIM_PARTICLE_MESH_EMITTER_HH__ -#define __SIM_PARTICLE_MESH_EMITTER_HH__ +#pragma once #include "simulation_solver_influences.hh" @@ -48,5 +47,3 @@ class ParticleMeshEmitter final : public ParticleEmitter { }; } // namespace blender::sim - -#endif /* __SIM_PARTICLE_MESH_EMITTER_HH__ */ diff --git a/source/blender/simulation/intern/simulation_solver_influences.hh b/source/blender/simulation/intern/simulation_solver_influences.hh index f7b8affd88d..d7914819d36 100644 --- a/source/blender/simulation/intern/simulation_solver_influences.hh +++ b/source/blender/simulation/intern/simulation_solver_influences.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __SIM_SIMULATION_SOLVER_INFLUENCES_HH__ -#define __SIM_SIMULATION_SOLVER_INFLUENCES_HH__ +#pragma once #include "BLI_float3.hh" #include "BLI_float4x4.hh" @@ -233,5 +232,3 @@ struct ParticleEventFilterContext { }; } // namespace blender::sim - -#endif /* __SIM_SIMULATION_SOLVER_INFLUENCES_HH__ */ |