diff options
author | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:04:57 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:04:57 +0300 |
commit | 7283e6fb73490ddd23425ba2cf06cda7ac8f9458 (patch) | |
tree | 7c0c7069a44743b7462d3ed271bedeb09300ec4f /source/blender/blenlib | |
parent | 21fec951396982807d9cbe3852c58dbc898a809c (diff) | |
parent | 91694b9b58ab953f3b313be9389cc1303e472fc2 (diff) |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/blenlib')
131 files changed, 132 insertions, 523 deletions
diff --git a/source/blender/blenlib/BLI_alloca.h b/source/blender/blenlib/BLI_alloca.h index 258e788ac12..92567ed35fa 100644 --- a/source/blender/blenlib/BLI_alloca.h +++ b/source/blender/blenlib/BLI_alloca.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_ALLOCA_H__ -#define __BLI_ALLOCA_H__ +#pragma once /** \file * \ingroup bli @@ -36,5 +35,3 @@ #else # define BLI_array_alloca(arr, realsize) alloca(sizeof(*arr) * (realsize)) #endif - -#endif /* __BLI_ALLOCA_H__ */ diff --git a/source/blender/blenlib/BLI_allocator.hh b/source/blender/blenlib/BLI_allocator.hh index 47d8156476f..3f753d1d81d 100644 --- a/source/blender/blenlib/BLI_allocator.hh +++ b/source/blender/blenlib/BLI_allocator.hh @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_ALLOCATOR_HH__ -#define __BLI_ALLOCATOR_HH__ +#pragma once /** \file * \ingroup bli @@ -100,5 +99,3 @@ class RawAllocator { }; } // namespace blender - -#endif /* __BLI_ALLOCATOR_HH__ */ diff --git a/source/blender/blenlib/BLI_args.h b/source/blender/blenlib/BLI_args.h index 9031cd2ba2f..54b5161f15a 100644 --- a/source/blender/blenlib/BLI_args.h +++ b/source/blender/blenlib/BLI_args.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_ARGS_H__ -#define __BLI_ARGS_H__ +#pragma once /** \file * \ingroup bli @@ -78,5 +77,3 @@ const char **BLI_argsArgv(struct bArgs *ba); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenlib/BLI_array.h b/source/blender/blenlib/BLI_array.h index 5b85711f8ac..6ea01d45f79 100644 --- a/source/blender/blenlib/BLI_array.h +++ b/source/blender/blenlib/BLI_array.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_ARRAY_H__ -#define __BLI_ARRAY_H__ +#pragma once /** \file * \ingroup bli @@ -173,5 +172,3 @@ void _bli_array_grow_func(void **arr_p, ((void)0) /** \} */ - -#endif /* __BLI_ARRAY_H__ */ diff --git a/source/blender/blenlib/BLI_array.hh b/source/blender/blenlib/BLI_array.hh index c7b4bdc977f..796123af765 100644 --- a/source/blender/blenlib/BLI_array.hh +++ b/source/blender/blenlib/BLI_array.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_ARRAY_HH__ -#define __BLI_ARRAY_HH__ +#pragma once /** \file * \ingroup bli @@ -369,5 +368,3 @@ template<typename T, int64_t InlineBufferCapacity = default_inline_buffer_capaci using RawArray = Array<T, InlineBufferCapacity, RawAllocator>; } // namespace blender - -#endif /* __BLI_ARRAY_HH__ */ diff --git a/source/blender/blenlib/BLI_array_store.h b/source/blender/blenlib/BLI_array_store.h index a8a7dde63b5..78d718117ba 100644 --- a/source/blender/blenlib/BLI_array_store.h +++ b/source/blender/blenlib/BLI_array_store.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_ARRAY_STORE_H__ -#define __BLI_ARRAY_STORE_H__ +#pragma once /** \file * \ingroup bli @@ -53,5 +52,3 @@ bool BLI_array_store_is_valid(BArrayStore *bs); #ifdef __cplusplus } #endif - -#endif /* __BLI_ARRAY_STORE_H__ */ diff --git a/source/blender/blenlib/BLI_array_store_utils.h b/source/blender/blenlib/BLI_array_store_utils.h index 5b5263bf8a4..771f4f962a7 100644 --- a/source/blender/blenlib/BLI_array_store_utils.h +++ b/source/blender/blenlib/BLI_array_store_utils.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_ARRAY_STORE_UTILS_H__ -#define __BLI_ARRAY_STORE_UTILS_H__ +#pragma once /** \file * \ingroup bli @@ -47,5 +46,3 @@ void BLI_array_store_at_size_calc_memory_usage(struct BArrayStore_AtSize *bs_str #ifdef __cplusplus } #endif - -#endif /* __BLI_ARRAY_STORE_UTILS_H__ */ diff --git a/source/blender/blenlib/BLI_array_utils.h b/source/blender/blenlib/BLI_array_utils.h index afa9a3d2241..b8d63e7cdc1 100644 --- a/source/blender/blenlib/BLI_array_utils.h +++ b/source/blender/blenlib/BLI_array_utils.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_ARRAY_UTILS_H__ -#define __BLI_ARRAY_UTILS_H__ +#pragma once /** \file * \ingroup bli @@ -93,5 +92,3 @@ bool _bli_array_is_zeroed(const void *arr, unsigned int arr_len, size_t arr_stri #ifdef __cplusplus } #endif - -#endif /* __BLI_ARRAY_UTILS_H__ */ diff --git a/source/blender/blenlib/BLI_asan.h b/source/blender/blenlib/BLI_asan.h index fdade805c2a..a2a44e164ab 100644 --- a/source/blender/blenlib/BLI_asan.h +++ b/source/blender/blenlib/BLI_asan.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_ADDRESS_SANITIZER_H__ -#define __BLI_ADDRESS_SANITIZER_H__ +#pragma once /* Clang defines this. */ #ifndef __has_feature @@ -41,5 +40,3 @@ * Mark a region of memory as usable again. */ #define BLI_asan_unpoison(addr, size) ASAN_UNPOISON_MEMORY_REGION(addr, size) - -#endif /* __BLI_ADDRESS_SANITIZER_H__ */ diff --git a/source/blender/blenlib/BLI_assert.h b/source/blender/blenlib/BLI_assert.h index 7978f04dd9d..172a2fb44ca 100644 --- a/source/blender/blenlib/BLI_assert.h +++ b/source/blender/blenlib/BLI_assert.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_ASSERT_H__ -#define __BLI_ASSERT_H__ +#pragma once /** \file * \ingroup bli @@ -92,5 +91,3 @@ void _BLI_assert_abort(void); #ifdef __cplusplus } #endif - -#endif /* __BLI_ASSERT_H__ */ diff --git a/source/blender/blenlib/BLI_astar.h b/source/blender/blenlib/BLI_astar.h index 8a70371cbcb..fe5c4ddad69 100644 --- a/source/blender/blenlib/BLI_astar.h +++ b/source/blender/blenlib/BLI_astar.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_ASTAR_H__ -#define __BLI_ASTAR_H__ +#pragma once /** \file * \ingroup bli @@ -121,5 +120,3 @@ bool BLI_astar_graph_solve(BLI_AStarGraph *as_graph, #ifdef __cplusplus } #endif - -#endif /* __BLI_ASTAR_H__ */ diff --git a/source/blender/blenlib/BLI_bitmap.h b/source/blender/blenlib/BLI_bitmap.h index 2b811e50efb..61a50662d79 100644 --- a/source/blender/blenlib/BLI_bitmap.h +++ b/source/blender/blenlib/BLI_bitmap.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_BITMAP_H__ -#define __BLI_BITMAP_H__ +#pragma once /** \file * \ingroup bli @@ -118,5 +117,3 @@ void BLI_bitmap_or_all(BLI_bitmap *dst, const BLI_bitmap *src, size_t bits); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenlib/BLI_bitmap_draw_2d.h b/source/blender/blenlib/BLI_bitmap_draw_2d.h index f5f8b28b27f..8331d8fac08 100644 --- a/source/blender/blenlib/BLI_bitmap_draw_2d.h +++ b/source/blender/blenlib/BLI_bitmap_draw_2d.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_BITMAP_DRAW_2D_H__ -#define __BLI_BITMAP_DRAW_2D_H__ +#pragma once /** \file * \ingroup bli @@ -48,5 +47,3 @@ void BLI_bitmap_draw_2d_poly_v2i_n(const int xmin, #ifdef __cplusplus } #endif - -#endif /* __BLI_BITMAP_DRAW_2D_H__ */ diff --git a/source/blender/blenlib/BLI_blenlib.h b/source/blender/blenlib/BLI_blenlib.h index 4ebef814337..a9e8c55b6b4 100644 --- a/source/blender/blenlib/BLI_blenlib.h +++ b/source/blender/blenlib/BLI_blenlib.h @@ -47,8 +47,7 @@ * standard libraries. */ -#ifndef __BLI_BLENLIB_H__ -#define __BLI_BLENLIB_H__ +#pragma once #include <stdlib.h> @@ -63,5 +62,3 @@ #include "BLI_fileops.h" #include "BLI_rect.h" - -#endif diff --git a/source/blender/blenlib/BLI_boxpack_2d.h b/source/blender/blenlib/BLI_boxpack_2d.h index 762cb7aaa44..c36cbc03928 100644 --- a/source/blender/blenlib/BLI_boxpack_2d.h +++ b/source/blender/blenlib/BLI_boxpack_2d.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_BOXPACK_2D_H__ -#define __BLI_BOXPACK_2D_H__ +#pragma once /** \file * \ingroup bli @@ -64,5 +63,3 @@ void BLI_box_pack_2d_fixedarea(struct ListBase *boxes, #ifdef __cplusplus } #endif - -#endif /* __BLI_BOXPACK_2D_H__ */ diff --git a/source/blender/blenlib/BLI_buffer.h b/source/blender/blenlib/BLI_buffer.h index d81446af14b..fc348c25c46 100644 --- a/source/blender/blenlib/BLI_buffer.h +++ b/source/blender/blenlib/BLI_buffer.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_BUFFER_H__ -#define __BLI_BUFFER_H__ +#pragma once /** \file * \ingroup bli @@ -100,5 +99,3 @@ void _bli_buffer_free(BLI_Buffer *buffer); #ifdef __cplusplus } #endif - -#endif /* __BLI_BUFFER_H__ */ diff --git a/source/blender/blenlib/BLI_color.hh b/source/blender/blenlib/BLI_color.hh index 72caa5b1118..c0d2f43645d 100644 --- a/source/blender/blenlib/BLI_color.hh +++ b/source/blender/blenlib/BLI_color.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_COLOR_HH__ -#define __BLI_COLOR_HH__ +#pragma once #include <iostream> @@ -127,5 +126,3 @@ struct Color4b { }; } // namespace blender - -#endif /* __BLI_COLOR_HH__ */ diff --git a/source/blender/blenlib/BLI_compiler_attrs.h b/source/blender/blenlib/BLI_compiler_attrs.h index 24da0be122c..680c4bc78da 100644 --- a/source/blender/blenlib/BLI_compiler_attrs.h +++ b/source/blender/blenlib/BLI_compiler_attrs.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_COMPILER_ATTRS_H__ -#define __BLI_COMPILER_ATTRS_H__ +#pragma once /** \file * \ingroup bli @@ -99,5 +98,3 @@ #else # define ATTR_ALIGN(x) __attribute__((aligned(x))) #endif - -#endif /* __BLI_COMPILER_ATTRS_H__ */ diff --git a/source/blender/blenlib/BLI_compiler_compat.h b/source/blender/blenlib/BLI_compiler_compat.h index 056ea1a08c6..0870d01872a 100644 --- a/source/blender/blenlib/BLI_compiler_compat.h +++ b/source/blender/blenlib/BLI_compiler_compat.h @@ -19,8 +19,8 @@ /* #define typeof() triggers a bug in some clang-format versions, disable format * for entire file to keep results consistent. */ -#ifndef __BLI_COMPILER_COMPAT_H__ -#define __BLI_COMPILER_COMPAT_H__ +#pragma once + /** \file * \ingroup bli @@ -56,4 +56,3 @@ template<typename T> static inline T decltype_helper(T x) # define BLI_NOINLINE #endif -#endif /* __BLI_COMPILER_COMPAT_H__ */ diff --git a/source/blender/blenlib/BLI_compiler_typecheck.h b/source/blender/blenlib/BLI_compiler_typecheck.h index 0a2eddc4ecc..d9c2bfc1d58 100644 --- a/source/blender/blenlib/BLI_compiler_typecheck.h +++ b/source/blender/blenlib/BLI_compiler_typecheck.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_COMPILER_TYPECHECK_H__ -#define __BLI_COMPILER_TYPECHECK_H__ +#pragma once /** \file * \ingroup bli @@ -692,5 +691,3 @@ /* clang-format on */ #define GENERIC_TYPE_ANY(...) VA_NARGS_CALL_OVERLOAD(_VA_GENERIC_TYPE_ANY, __VA_ARGS__) - -#endif /* __BLI_COMPILER_TYPECHECK_H__ */ diff --git a/source/blender/blenlib/BLI_console.h b/source/blender/blenlib/BLI_console.h index d666de3a8e8..dc07d3df754 100644 --- a/source/blender/blenlib/BLI_console.h +++ b/source/blender/blenlib/BLI_console.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_CONSOLE_H__ -#define __BLI_CONSOLE_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -40,5 +39,3 @@ extern "C" { #ifdef __cplusplus } #endif - -#endif /* __BLI_CONSOLE_H__ */ diff --git a/source/blender/blenlib/BLI_convexhull_2d.h b/source/blender/blenlib/BLI_convexhull_2d.h index 7417c1e3a98..e930117822f 100644 --- a/source/blender/blenlib/BLI_convexhull_2d.h +++ b/source/blender/blenlib/BLI_convexhull_2d.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_CONVEXHULL_2D_H__ -#define __BLI_CONVEXHULL_2D_H__ +#pragma once /** \file * \ingroup bli @@ -34,5 +33,3 @@ float BLI_convexhull_aabb_fit_points_2d(const float (*points)[2], unsigned int n #ifdef __cplusplus } #endif - -#endif /* __BLI_CONVEXHULL_2D_H__ */ diff --git a/source/blender/blenlib/BLI_delaunay_2d.h b/source/blender/blenlib/BLI_delaunay_2d.h index 95111dbbbf7..a826a6b2677 100644 --- a/source/blender/blenlib/BLI_delaunay_2d.h +++ b/source/blender/blenlib/BLI_delaunay_2d.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_DELAUNAY_2D_H__ -#define __BLI_DELAUNAY_2D_H__ +#pragma once /** \file * \ingroup bli @@ -209,5 +208,3 @@ void BLI_delaunay_2d_cdt_free(CDT_result *result); #ifdef __cplusplus } #endif - -#endif /* __BLI_DELAUNAY_2D_H__ */ diff --git a/source/blender/blenlib/BLI_dial_2d.h b/source/blender/blenlib/BLI_dial_2d.h index 83467881eb5..fdbc3d4430b 100644 --- a/source/blender/blenlib/BLI_dial_2d.h +++ b/source/blender/blenlib/BLI_dial_2d.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_DIAL_2D_H__ -#define __BLI_DIAL_2D_H__ +#pragma once /** \file * \ingroup bli @@ -59,5 +58,3 @@ float BLI_dial_angle(Dial *dial, const float current_position[2]); #ifdef __cplusplus } #endif - -#endif /* __BLI_DIAL_2D_H__ */ diff --git a/source/blender/blenlib/BLI_disjoint_set.hh b/source/blender/blenlib/BLI_disjoint_set.hh index e0580709a44..2002577f956 100644 --- a/source/blender/blenlib/BLI_disjoint_set.hh +++ b/source/blender/blenlib/BLI_disjoint_set.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_DISJOINT_SET_HH__ -#define __BLI_DISJOINT_SET_HH__ +#pragma once /** \file * \ingroup bli @@ -102,5 +101,3 @@ class DisjointSet { }; } // namespace blender - -#endif /* __BLI_DISJOINT_SET_HH__ */ diff --git a/source/blender/blenlib/BLI_dlrbTree.h b/source/blender/blenlib/BLI_dlrbTree.h index 5db0dd16a34..fc52904d699 100644 --- a/source/blender/blenlib/BLI_dlrbTree.h +++ b/source/blender/blenlib/BLI_dlrbTree.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_DLRBTREE_H__ -#define __BLI_DLRBTREE_H__ +#pragma once /** \file * \ingroup bli @@ -166,5 +165,3 @@ void BLI_dlrbTree_insert(DLRBT_Tree *tree, DLRBT_Node *node); #ifdef __cplusplus } #endif - -#endif /* __BLI_DLRBTREE_H__ */ diff --git a/source/blender/blenlib/BLI_dot_export.hh b/source/blender/blenlib/BLI_dot_export.hh index 42fe53d67cf..a026a85dd62 100644 --- a/source/blender/blenlib/BLI_dot_export.hh +++ b/source/blender/blenlib/BLI_dot_export.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_DOT_EXPORT_HH__ -#define __BLI_DOT_EXPORT_HH__ +#pragma once /** * Language grammar: https://www.graphviz.org/doc/info/lang.html @@ -292,5 +291,3 @@ class NodeWithSocketsRef { }; } // namespace blender::dot - -#endif /* __BLI_DOT_EXPORT_HH__ */ diff --git a/source/blender/blenlib/BLI_dot_export_attribute_enums.hh b/source/blender/blenlib/BLI_dot_export_attribute_enums.hh index 94c7025b2a6..8cbe7a3e6e6 100644 --- a/source/blender/blenlib/BLI_dot_export_attribute_enums.hh +++ b/source/blender/blenlib/BLI_dot_export_attribute_enums.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_DOT_EXPORT_ATTRIBUTE_ENUMS_HH__ -#define __BLI_DOT_EXPORT_ATTRIBUTE_ENUMS_HH__ +#pragma once #include "BLI_string_ref.hh" @@ -119,5 +118,3 @@ inline StringRef dirType_to_string(Attr_dirType value) } } // namespace blender::dot - -#endif /* __BLI_DOT_EXPORT_ATTRIBUTE_ENUMS_HH__ */ diff --git a/source/blender/blenlib/BLI_dynlib.h b/source/blender/blenlib/BLI_dynlib.h index 4adffd51e17..628e33b6f02 100644 --- a/source/blender/blenlib/BLI_dynlib.h +++ b/source/blender/blenlib/BLI_dynlib.h @@ -21,8 +21,7 @@ * \ingroup bli */ -#ifndef __BLI_DYNLIB_H__ -#define __BLI_DYNLIB_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -38,5 +37,3 @@ void BLI_dynlib_close(DynamicLibrary *lib); #ifdef __cplusplus } #endif - -#endif /* __BLI_DYNLIB_H__ */ diff --git a/source/blender/blenlib/BLI_dynstr.h b/source/blender/blenlib/BLI_dynstr.h index cb1f3d58f23..075786c4424 100644 --- a/source/blender/blenlib/BLI_dynstr.h +++ b/source/blender/blenlib/BLI_dynstr.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_DYNSTR_H__ -#define __BLI_DYNSTR_H__ +#pragma once /** \file * \ingroup bli @@ -64,5 +63,3 @@ void BLI_dynstr_free(DynStr *ds) ATTR_NONNULL(); #ifdef __cplusplus } #endif - -#endif /* __BLI_DYNSTR_H__ */ diff --git a/source/blender/blenlib/BLI_easing.h b/source/blender/blenlib/BLI_easing.h index 73e17be31b7..e6bf8c3bdfa 100644 --- a/source/blender/blenlib/BLI_easing.h +++ b/source/blender/blenlib/BLI_easing.h @@ -28,8 +28,7 @@ * All rights reserved. */ -#ifndef __BLI_EASING_H__ -#define __BLI_EASING_H__ +#pragma once /** \file * \ingroup bli @@ -80,5 +79,3 @@ float BLI_easing_sine_ease_in_out(float time, float begin, float change, float d #ifdef __cplusplus } #endif - -#endif /* __BLI_EASING_H__ */ diff --git a/source/blender/blenlib/BLI_edgehash.h b/source/blender/blenlib/BLI_edgehash.h index 0e2d0b538c7..44dc3cf096b 100644 --- a/source/blender/blenlib/BLI_edgehash.h +++ b/source/blender/blenlib/BLI_edgehash.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_EDGEHASH_H__ -#define __BLI_EDGEHASH_H__ +#pragma once /** \file * \ingroup bli @@ -158,5 +157,3 @@ BLI_INLINE bool BLI_edgesetIterator_isDone(EdgeSetIterator *esi) #ifdef __cplusplus } #endif - -#endif /* __BLI_EDGEHASH_H__ */ diff --git a/source/blender/blenlib/BLI_endian_switch_inline.h b/source/blender/blenlib/BLI_endian_switch_inline.h index 316e24cfc6d..70d428147e2 100644 --- a/source/blender/blenlib/BLI_endian_switch_inline.h +++ b/source/blender/blenlib/BLI_endian_switch_inline.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_ENDIAN_SWITCH_INLINE_H__ -#define __BLI_ENDIAN_SWITCH_INLINE_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -92,5 +91,3 @@ BLI_INLINE void BLI_endian_switch_double(double *val) #ifdef __cplusplus } #endif - -#endif /* __BLI_ENDIAN_SWITCH_INLINE_H__ */ diff --git a/source/blender/blenlib/BLI_expr_pylike_eval.h b/source/blender/blenlib/BLI_expr_pylike_eval.h index 1db91ea4205..c074b5d8130 100644 --- a/source/blender/blenlib/BLI_expr_pylike_eval.h +++ b/source/blender/blenlib/BLI_expr_pylike_eval.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_EXPR_PYLIKE_EVAL_H__ -#define __BLI_EXPR_PYLIKE_EVAL_H__ +#pragma once /** \file * \ingroup bli @@ -57,5 +56,3 @@ eExprPyLike_EvalStatus BLI_expr_pylike_eval(struct ExprPyLike_Parsed *expr, #ifdef __cplusplus } #endif - -#endif /* __BLI_EXPR_PYLIKE_EVAL_H__ */ diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h index fe4600b9121..e61e20ee5e9 100644 --- a/source/blender/blenlib/BLI_fileops.h +++ b/source/blender/blenlib/BLI_fileops.h @@ -22,8 +22,7 @@ * \brief File and directory operations. * */ -#ifndef __BLI_FILEOPS_H__ -#define __BLI_FILEOPS_H__ +#pragma once #include <stdint.h> #include <stdio.h> @@ -189,5 +188,3 @@ void BLI_get_short_name(char short_name[256], const char *filename); #ifdef __cplusplus } #endif - -#endif /* __BLI_FILEOPS_H__ */ diff --git a/source/blender/blenlib/BLI_fileops_types.h b/source/blender/blenlib/BLI_fileops_types.h index 41f916ed0ca..cdae9665f98 100644 --- a/source/blender/blenlib/BLI_fileops_types.h +++ b/source/blender/blenlib/BLI_fileops_types.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_FILEOPS_TYPES_H__ -#define __BLI_FILEOPS_TYPES_H__ +#pragma once /** \file * \ingroup bli @@ -64,5 +63,3 @@ struct dirlink { #ifdef __cplusplus } #endif - -#endif /* __BLI_FILEOPS_TYPES_H__ */ diff --git a/source/blender/blenlib/BLI_float2.hh b/source/blender/blenlib/BLI_float2.hh index 5fe9d1b8ca9..e55a8de4633 100644 --- a/source/blender/blenlib/BLI_float2.hh +++ b/source/blender/blenlib/BLI_float2.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_FLOAT2_HH__ -#define __BLI_FLOAT2_HH__ +#pragma once #include "BLI_float3.hh" @@ -120,5 +119,3 @@ struct float2 { }; } // namespace blender - -#endif /* __BLI_FLOAT2_HH__ */ diff --git a/source/blender/blenlib/BLI_float3.hh b/source/blender/blenlib/BLI_float3.hh index 6acf4716525..a976e909738 100644 --- a/source/blender/blenlib/BLI_float3.hh +++ b/source/blender/blenlib/BLI_float3.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_FLOAT3_HH__ -#define __BLI_FLOAT3_HH__ +#pragma once #include <iostream> @@ -247,5 +246,3 @@ struct float3 { }; } // namespace blender - -#endif /* __BLI_FLOAT3_HH__ */ diff --git a/source/blender/blenlib/BLI_float4x4.hh b/source/blender/blenlib/BLI_float4x4.hh index b4f12f17cc2..85d38149bb9 100644 --- a/source/blender/blenlib/BLI_float4x4.hh +++ b/source/blender/blenlib/BLI_float4x4.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_FLOAT4X4_HH__ -#define __BLI_FLOAT4X4_HH__ +#pragma once #include "BLI_float3.hh" #include "BLI_math_matrix.h" @@ -133,5 +132,3 @@ struct float4x4 { }; } // namespace blender - -#endif /* __BLI_FLOAT4X4_HH__ */ diff --git a/source/blender/blenlib/BLI_fnmatch.h b/source/blender/blenlib/BLI_fnmatch.h index 28169c36e23..d09a14621d8 100644 --- a/source/blender/blenlib/BLI_fnmatch.h +++ b/source/blender/blenlib/BLI_fnmatch.h @@ -19,8 +19,7 @@ * Bugs can be reported to bug-glibc@prep.ai.mit.edu. */ -#ifndef __BLI_FNMATCH_H__ -#define __BLI_FNMATCH_H__ +#pragma once /** \file * \ingroup bli @@ -77,5 +76,3 @@ extern int fnmatch __P((const char *__pattern, const char *__string, int __flags #ifdef __cplusplus } #endif - -#endif /* __BLI_FNMATCH_H__ */ diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h index 31a9658bd7e..cd84dd4f327 100644 --- a/source/blender/blenlib/BLI_ghash.h +++ b/source/blender/blenlib/BLI_ghash.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_GHASH_H__ -#define __BLI_GHASH_H__ +#pragma once /** \file * \ingroup bli @@ -416,5 +415,3 @@ GSet *BLI_gset_int_new(const char *info) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; #ifdef __cplusplus } #endif - -#endif /* __BLI_GHASH_H__ */ diff --git a/source/blender/blenlib/BLI_gsqueue.h b/source/blender/blenlib/BLI_gsqueue.h index b69bdb7057c..077d1646d1d 100644 --- a/source/blender/blenlib/BLI_gsqueue.h +++ b/source/blender/blenlib/BLI_gsqueue.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_GSQUEUE_H__ -#define __BLI_GSQUEUE_H__ +#pragma once /** \file * \ingroup bli @@ -42,5 +41,3 @@ void BLI_gsqueue_free(GSQueue *gq); #ifdef __cplusplus } #endif - -#endif /* __BLI_GSQUEUE_H__ */ diff --git a/source/blender/blenlib/BLI_hash.h b/source/blender/blenlib/BLI_hash.h index 96111ffaf5a..c2be416ef5f 100644 --- a/source/blender/blenlib/BLI_hash.h +++ b/source/blender/blenlib/BLI_hash.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_HASH_H__ -#define __BLI_HASH_H__ +#pragma once /** \file * \ingroup bli @@ -91,5 +90,3 @@ BLI_INLINE void BLI_hash_pointer_to_color(const void *ptr, int *r, int *g, int * #ifdef __cplusplus } #endif - -#endif // __BLI_HASH_H__ diff --git a/source/blender/blenlib/BLI_hash.hh b/source/blender/blenlib/BLI_hash.hh index b14a4ca933c..ad3224e037a 100644 --- a/source/blender/blenlib/BLI_hash.hh +++ b/source/blender/blenlib/BLI_hash.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_HASH_HH__ -#define __BLI_HASH_HH__ +#pragma once /** \file * \ingroup bli @@ -210,5 +209,3 @@ template<typename T1, typename T2> struct DefaultHash<std::pair<T1, T2>> { }; } // namespace blender - -#endif /* __BLI_HASH_HH__ */ diff --git a/source/blender/blenlib/BLI_hash_md5.h b/source/blender/blenlib/BLI_hash_md5.h index b326b17c19b..4a5cd8b19f3 100644 --- a/source/blender/blenlib/BLI_hash_md5.h +++ b/source/blender/blenlib/BLI_hash_md5.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_HASH_MD5_H__ -#define __BLI_HASH_MD5_H__ +#pragma once /** \file * \ingroup bli @@ -43,5 +42,3 @@ char *BLI_hash_md5_to_hexdigest(void *resblock, char r_hex_digest[33]); #ifdef __cplusplus } #endif - -#endif /* __BLI_HASH_MD5_H__ */ diff --git a/source/blender/blenlib/BLI_hash_mm2a.h b/source/blender/blenlib/BLI_hash_mm2a.h index 840ff31dd19..193a78e6293 100644 --- a/source/blender/blenlib/BLI_hash_mm2a.h +++ b/source/blender/blenlib/BLI_hash_mm2a.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_HASH_MM2A_H__ -#define __BLI_HASH_MM2A_H__ +#pragma once /** \file * \ingroup bli @@ -47,5 +46,3 @@ uint32_t BLI_hash_mm2(const unsigned char *data, size_t len, uint32_t seed); #ifdef __cplusplus } #endif - -#endif /* __BLI_HASH_MM2A_H__ */ diff --git a/source/blender/blenlib/BLI_hash_mm3.h b/source/blender/blenlib/BLI_hash_mm3.h index e76808812bc..99c24f53dd4 100644 --- a/source/blender/blenlib/BLI_hash_mm3.h +++ b/source/blender/blenlib/BLI_hash_mm3.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_HASH_MM3_H__ -#define __BLI_HASH_MM3_H__ +#pragma once /** \file * \ingroup bli @@ -32,5 +31,3 @@ uint32_t BLI_hash_mm3(const unsigned char *data, size_t len, uint32_t seed); #ifdef __cplusplus } #endif - -#endif /* __BLI_HASH_MM2A_H__ */ diff --git a/source/blender/blenlib/BLI_hash_tables.hh b/source/blender/blenlib/BLI_hash_tables.hh index 5d8f8862a09..e6026d93e2c 100644 --- a/source/blender/blenlib/BLI_hash_tables.hh +++ b/source/blender/blenlib/BLI_hash_tables.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_OPEN_ADDRESSING_HH__ -#define __BLI_OPEN_ADDRESSING_HH__ +#pragma once /** \file * \ingroup bli @@ -353,5 +352,3 @@ struct DefaultEquality { }; } // namespace blender - -#endif /* __BLI_OPEN_ADDRESSING_HH__ */ diff --git a/source/blender/blenlib/BLI_heap.h b/source/blender/blenlib/BLI_heap.h index ca5edcbead5..4cfb7945303 100644 --- a/source/blender/blenlib/BLI_heap.h +++ b/source/blender/blenlib/BLI_heap.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_HEAP_H__ -#define __BLI_HEAP_H__ +#pragma once /** \file * \ingroup bli @@ -61,5 +60,3 @@ bool BLI_heap_is_valid(const Heap *heap); #ifdef __cplusplus } #endif - -#endif /* __BLI_HEAP_H__ */ diff --git a/source/blender/blenlib/BLI_heap_simple.h b/source/blender/blenlib/BLI_heap_simple.h index d2bc542491c..b2a1b5582e5 100644 --- a/source/blender/blenlib/BLI_heap_simple.h +++ b/source/blender/blenlib/BLI_heap_simple.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_HEAP_SIMPLE_H__ -#define __BLI_HEAP_SIMPLE_H__ +#pragma once /** \file * \ingroup bli @@ -44,5 +43,3 @@ void *BLI_heapsimple_pop_min(HeapSimple *heap) ATTR_NONNULL(1); #ifdef __cplusplus } #endif - -#endif /* __BLI_HEAP_SIMPLE_H__ */ diff --git a/source/blender/blenlib/BLI_index_mask.hh b/source/blender/blenlib/BLI_index_mask.hh index ff271faa0c2..48b01edcd6f 100644 --- a/source/blender/blenlib/BLI_index_mask.hh +++ b/source/blender/blenlib/BLI_index_mask.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_INDEX_MASK_HH__ -#define __BLI_INDEX_MASK_HH__ +#pragma once /** \file * \ingroup bli @@ -208,5 +207,3 @@ class IndexMask { }; } // namespace blender - -#endif /* __BLI_INDEX_MASK_HH__ */ diff --git a/source/blender/blenlib/BLI_index_range.hh b/source/blender/blenlib/BLI_index_range.hh index 7c813f58b2c..2b060c986cd 100644 --- a/source/blender/blenlib/BLI_index_range.hh +++ b/source/blender/blenlib/BLI_index_range.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_INDEX_RANGE_HH__ -#define __BLI_INDEX_RANGE_HH__ +#pragma once /** \file * \ingroup bli @@ -245,5 +244,3 @@ class IndexRange { }; } // namespace blender - -#endif /* __BLI_INDEX_RANGE_HH__ */ diff --git a/source/blender/blenlib/BLI_iterator.h b/source/blender/blenlib/BLI_iterator.h index ce2311aa3f7..c1cd1c21dac 100644 --- a/source/blender/blenlib/BLI_iterator.h +++ b/source/blender/blenlib/BLI_iterator.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_ITERATOR_H__ -#define __BLI_ITERATOR_H__ +#pragma once /** \file * \ingroup bli @@ -58,5 +57,3 @@ typedef void (*IteratorBeginCb)(BLI_Iterator *iter, void *data_in); #ifdef __cplusplus } #endif - -#endif /* __BLI_ITERATOR_H__ */ diff --git a/source/blender/blenlib/BLI_jitter_2d.h b/source/blender/blenlib/BLI_jitter_2d.h index fa184916b5b..a0af352ddd2 100644 --- a/source/blender/blenlib/BLI_jitter_2d.h +++ b/source/blender/blenlib/BLI_jitter_2d.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_JITTER_2D_H__ -#define __BLI_JITTER_2D_H__ +#pragma once /** \file * \ingroup bli @@ -35,5 +34,3 @@ void BLI_jitterate2(float (*jit1)[2], float (*jit2)[2], int num, float radius2); #ifdef __cplusplus } #endif - -#endif /* __BLI_JITTER_2D_H__ */ diff --git a/source/blender/blenlib/BLI_kdopbvh.h b/source/blender/blenlib/BLI_kdopbvh.h index 9e4e30181b9..5e317c89625 100644 --- a/source/blender/blenlib/BLI_kdopbvh.h +++ b/source/blender/blenlib/BLI_kdopbvh.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_KDOPBVH_H__ -#define __BLI_KDOPBVH_H__ +#pragma once /** \file * \ingroup bli @@ -264,5 +263,3 @@ extern const float bvhtree_kdop_axes[13][3]; #ifdef __cplusplus } #endif - -#endif /* __BLI_KDOPBVH_H__ */ diff --git a/source/blender/blenlib/BLI_kdtree.h b/source/blender/blenlib/BLI_kdtree.h index 9ba045fdbf8..76f39dfbacb 100644 --- a/source/blender/blenlib/BLI_kdtree.h +++ b/source/blender/blenlib/BLI_kdtree.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_KDTREE_H__ -#define __BLI_KDTREE_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -73,5 +72,3 @@ extern "C" { #ifdef __cplusplus } #endif - -#endif /* __BLI_KDTREE_H__ */ diff --git a/source/blender/blenlib/BLI_lasso_2d.h b/source/blender/blenlib/BLI_lasso_2d.h index fb661c41784..e920d1189a2 100644 --- a/source/blender/blenlib/BLI_lasso_2d.h +++ b/source/blender/blenlib/BLI_lasso_2d.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_LASSO_2D_H__ -#define __BLI_LASSO_2D_H__ +#pragma once /** \file * \ingroup bli @@ -47,5 +46,3 @@ bool BLI_lasso_is_edge_inside(const int mcoords[][2], #ifdef __cplusplus } #endif - -#endif /* __BLI_LASSO_2D_H__ */ diff --git a/source/blender/blenlib/BLI_linear_allocator.hh b/source/blender/blenlib/BLI_linear_allocator.hh index 39a3ed27f42..fcc20d483c9 100644 --- a/source/blender/blenlib/BLI_linear_allocator.hh +++ b/source/blender/blenlib/BLI_linear_allocator.hh @@ -22,8 +22,7 @@ * memory. When the current buffer is full, it reallocates a new larger buffer and continues. */ -#ifndef __BLI_LINEAR_ALLOCATOR_HH__ -#define __BLI_LINEAR_ALLOCATOR_HH__ +#pragma once #include "BLI_string_ref.hh" #include "BLI_utility_mixins.hh" @@ -219,5 +218,3 @@ template<typename Allocator = GuardedAllocator> class LinearAllocator : NonCopya }; } // namespace blender - -#endif /* __BLI_LINEAR_ALLOCATOR_HH__ */ diff --git a/source/blender/blenlib/BLI_link_utils.h b/source/blender/blenlib/BLI_link_utils.h index c0db53ca9a3..a877860cd8d 100644 --- a/source/blender/blenlib/BLI_link_utils.h +++ b/source/blender/blenlib/BLI_link_utils.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_LINK_UTILS_H__ -#define __BLI_LINK_UTILS_H__ +#pragma once /** \file * \ingroup bli @@ -67,5 +66,3 @@ } \ } \ (void)0 - -#endif /* __BLI_LINK_UTILS_H__ */ diff --git a/source/blender/blenlib/BLI_linklist.h b/source/blender/blenlib/BLI_linklist.h index 324da859af1..25d58a3050c 100644 --- a/source/blender/blenlib/BLI_linklist.h +++ b/source/blender/blenlib/BLI_linklist.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_LINKLIST_H__ -#define __BLI_LINKLIST_H__ +#pragma once /** \file * \ingroup bli @@ -101,5 +100,3 @@ LinkNode *BLI_linklist_sort_r(LinkNode *list, #ifdef __cplusplus } #endif - -#endif /* __BLI_LINKLIST_H__ */ diff --git a/source/blender/blenlib/BLI_linklist_lockfree.h b/source/blender/blenlib/BLI_linklist_lockfree.h index 647b00ec658..142fa1cf243 100644 --- a/source/blender/blenlib/BLI_linklist_lockfree.h +++ b/source/blender/blenlib/BLI_linklist_lockfree.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_LINKLIST_LOCKFREE_H__ -#define __BLI_LINKLIST_LOCKFREE_H__ +#pragma once /** \file * \ingroup bli @@ -73,5 +72,3 @@ void BLI_linklist_lockfree_insert(LockfreeLinkList *list, LockfreeLinkNode *node #ifdef __cplusplus } #endif - -#endif /* __BLI_LINKLIST_H__ */ diff --git a/source/blender/blenlib/BLI_linklist_stack.h b/source/blender/blenlib/BLI_linklist_stack.h index 3725682d380..065ed12f353 100644 --- a/source/blender/blenlib/BLI_linklist_stack.h +++ b/source/blender/blenlib/BLI_linklist_stack.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_LINKLIST_STACK_H__ -#define __BLI_LINKLIST_STACK_H__ +#pragma once /** \file * \ingroup bli @@ -194,5 +193,3 @@ (void)0 /** \} */ - -#endif /* __BLI_LINKLIST_STACK_H__ */ diff --git a/source/blender/blenlib/BLI_listbase.h b/source/blender/blenlib/BLI_listbase.h index b027acb88da..fa7cf7a1847 100644 --- a/source/blender/blenlib/BLI_listbase.h +++ b/source/blender/blenlib/BLI_listbase.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_LISTBASE_H__ -#define __BLI_LISTBASE_H__ +#pragma once /** \file * \ingroup bli @@ -190,5 +189,3 @@ struct LinkData *BLI_genericNodeN(void *data); #ifdef __cplusplus } #endif - -#endif /* __BLI_LISTBASE_H__ */ diff --git a/source/blender/blenlib/BLI_listbase_wrapper.hh b/source/blender/blenlib/BLI_listbase_wrapper.hh index 46f4a9d49fa..00f757d4bc2 100644 --- a/source/blender/blenlib/BLI_listbase_wrapper.hh +++ b/source/blender/blenlib/BLI_listbase_wrapper.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_LISTBASE_WRAPPER_HH__ -#define __BLI_LISTBASE_WRAPPER_HH__ +#pragma once /** \file * \ingroup bli @@ -111,5 +110,3 @@ template<typename T> class ListBaseWrapper { }; } /* namespace blender */ - -#endif /* __BLI_LISTBASE_WRAPPER_HH__ */ diff --git a/source/blender/blenlib/BLI_map.hh b/source/blender/blenlib/BLI_map.hh index dd375272fdb..f90d59f45a5 100644 --- a/source/blender/blenlib/BLI_map.hh +++ b/source/blender/blenlib/BLI_map.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_MAP_HH__ -#define __BLI_MAP_HH__ +#pragma once /** \file * \ingroup bli @@ -1242,5 +1241,3 @@ template<typename Key, typename Value> class StdUnorderedMapWrapper { }; } // namespace blender - -#endif /* __BLI_MAP_HH__ */ diff --git a/source/blender/blenlib/BLI_map_slots.hh b/source/blender/blenlib/BLI_map_slots.hh index b5360795a13..25fb92d61a3 100644 --- a/source/blender/blenlib/BLI_map_slots.hh +++ b/source/blender/blenlib/BLI_map_slots.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_MAP_SLOTS_HH__ -#define __BLI_MAP_SLOTS_HH__ +#pragma once /** \file * \ingroup bli @@ -357,5 +356,3 @@ template<typename Key, typename Value> struct DefaultMapSlot<Key *, Value> { }; } // namespace blender - -#endif /* __BLI_MAP_SLOTS_HH__ */ diff --git a/source/blender/blenlib/BLI_math.h b/source/blender/blenlib/BLI_math.h index f8de8b7ed53..51833d081d0 100644 --- a/source/blender/blenlib/BLI_math.h +++ b/source/blender/blenlib/BLI_math.h @@ -20,8 +20,7 @@ * * */ -#ifndef __BLI_MATH_H__ -#define __BLI_MATH_H__ +#pragma once /** \file * \ingroup bli @@ -73,5 +72,3 @@ #include "BLI_math_solvers.h" #include "BLI_math_statistics.h" #include "BLI_math_vector.h" - -#endif /* __BLI_MATH_H__ */ diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index c456ab0ecef..f407da3133f 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -20,8 +20,7 @@ * * */ -#ifndef __BLI_MATH_BASE_H__ -#define __BLI_MATH_BASE_H__ +#pragma once /** \file * \ingroup bli @@ -289,5 +288,3 @@ double double_round(double x, int ndigits); #ifdef __cplusplus } #endif - -#endif /* __BLI_MATH_BASE_H__ */ diff --git a/source/blender/blenlib/BLI_math_base_safe.h b/source/blender/blenlib/BLI_math_base_safe.h index 88a08c3cbc7..1d6590b2faa 100644 --- a/source/blender/blenlib/BLI_math_base_safe.h +++ b/source/blender/blenlib/BLI_math_base_safe.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_MATH_BASE_SAFE_H__ -#define __BLI_MATH_BASE_SAFE_H__ +#pragma once /** \file * \ingroup bli @@ -46,5 +45,3 @@ MINLINE float safe_powf(float base, float exponent); #if BLI_MATH_DO_INLINE # include "intern/math_base_safe_inline.c" #endif - -#endif /* __BLI_MATH_BASE_SAFE_H__ */ diff --git a/source/blender/blenlib/BLI_math_bits.h b/source/blender/blenlib/BLI_math_bits.h index 0283622ca89..b602900bedc 100644 --- a/source/blender/blenlib/BLI_math_bits.h +++ b/source/blender/blenlib/BLI_math_bits.h @@ -15,8 +15,7 @@ * * */ -#ifndef __BLI_MATH_BITS_H__ -#define __BLI_MATH_BITS_H__ +#pragma once /** \file * \ingroup bli @@ -68,5 +67,3 @@ MINLINE float xor_fl(float x, int y); #ifdef __cplusplus } #endif - -#endif /* __BLI_MATH_BITS_H__ */ diff --git a/source/blender/blenlib/BLI_math_color.h b/source/blender/blenlib/BLI_math_color.h index 48f8e7d31d9..943f0fc764f 100644 --- a/source/blender/blenlib/BLI_math_color.h +++ b/source/blender/blenlib/BLI_math_color.h @@ -20,8 +20,7 @@ * * */ -#ifndef __BLI_MATH_COLOR_H__ -#define __BLI_MATH_COLOR_H__ +#pragma once /** \file * \ingroup bli @@ -162,5 +161,3 @@ void lift_gamma_gain_to_asc_cdl(const float *lift, #ifdef __cplusplus } #endif - -#endif /* __BLI_MATH_COLOR_H__ */ diff --git a/source/blender/blenlib/BLI_math_color_blend.h b/source/blender/blenlib/BLI_math_color_blend.h index 60ada1e4509..d5e4eedb1a6 100644 --- a/source/blender/blenlib/BLI_math_color_blend.h +++ b/source/blender/blenlib/BLI_math_color_blend.h @@ -20,8 +20,7 @@ * * */ -#ifndef __BLI_MATH_COLOR_BLEND_H__ -#define __BLI_MATH_COLOR_BLEND_H__ +#pragma once /** \file * \ingroup bli @@ -151,5 +150,3 @@ MINLINE void blend_color_interpolate_float(float dst[4], #ifdef __cplusplus } #endif - -#endif /* __BLI_MATH_COLOR_BLEND_H__ */ diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h index 3a24209b07c..3d1edb9c3b1 100644 --- a/source/blender/blenlib/BLI_math_geom.h +++ b/source/blender/blenlib/BLI_math_geom.h @@ -20,8 +20,7 @@ * * */ -#ifndef __BLI_MATH_GEOM_H__ -#define __BLI_MATH_GEOM_H__ +#pragma once /** \file * \ingroup bli @@ -825,5 +824,3 @@ float cubic_tangent_factor_circle_v3(const float tan_l[3], const float tan_r[3]) #ifdef __cplusplus } #endif - -#endif /* __BLI_MATH_GEOM_H__ */ diff --git a/source/blender/blenlib/BLI_math_inline.h b/source/blender/blenlib/BLI_math_inline.h index 3e32a517471..506386f8d25 100644 --- a/source/blender/blenlib/BLI_math_inline.h +++ b/source/blender/blenlib/BLI_math_inline.h @@ -20,8 +20,7 @@ * * */ -#ifndef __BLI_MATH_INLINE_H__ -#define __BLI_MATH_INLINE_H__ +#pragma once /** \file * \ingroup bli @@ -56,5 +55,3 @@ extern "C" { #ifdef __cplusplus } #endif - -#endif /* __BLI_MATH_INLINE_H__ */ diff --git a/source/blender/blenlib/BLI_math_interp.h b/source/blender/blenlib/BLI_math_interp.h index 0f3032fa625..3e9839b4d3a 100644 --- a/source/blender/blenlib/BLI_math_interp.h +++ b/source/blender/blenlib/BLI_math_interp.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_MATH_INTERP_H__ -#define __BLI_MATH_INTERP_H__ +#pragma once /** \file * \ingroup bli @@ -95,5 +94,3 @@ void BLI_ewa_filter(const int width, #ifdef __cplusplus } #endif - -#endif /* __BLI_MATH_INTERP_H__ */ diff --git a/source/blender/blenlib/BLI_math_matrix.h b/source/blender/blenlib/BLI_math_matrix.h index 33fcd750aee..a00fdaa0ae9 100644 --- a/source/blender/blenlib/BLI_math_matrix.h +++ b/source/blender/blenlib/BLI_math_matrix.h @@ -19,8 +19,7 @@ * The Original Code is: some of this file. * */ -#ifndef __BLI_MATH_MATRIX_H__ -#define __BLI_MATH_MATRIX_H__ +#pragma once /** \file * \ingroup bli @@ -399,5 +398,3 @@ void print_m4(const char *str, const float M[4][4]); #ifdef __cplusplus } #endif - -#endif /* __BLI_MATH_MATRIX_H__ */ diff --git a/source/blender/blenlib/BLI_math_rotation.h b/source/blender/blenlib/BLI_math_rotation.h index b7ae35b2e23..61708528e24 100644 --- a/source/blender/blenlib/BLI_math_rotation.h +++ b/source/blender/blenlib/BLI_math_rotation.h @@ -20,8 +20,7 @@ * * */ -#ifndef __BLI_MATH_ROTATION_H__ -#define __BLI_MATH_ROTATION_H__ +#pragma once /** \file * \ingroup bli @@ -246,5 +245,3 @@ bool mat3_from_axis_conversion_single(int src_axis, int dst_axis, float r_mat[3] #ifdef __cplusplus } #endif - -#endif /* __BLI_MATH_ROTATION_H__ */ diff --git a/source/blender/blenlib/BLI_math_solvers.h b/source/blender/blenlib/BLI_math_solvers.h index 193bbdd4e8c..9b2d1eedec7 100644 --- a/source/blender/blenlib/BLI_math_solvers.h +++ b/source/blender/blenlib/BLI_math_solvers.h @@ -17,8 +17,7 @@ * All rights reserved. * */ -#ifndef __BLI_MATH_SOLVERS_H__ -#define __BLI_MATH_SOLVERS_H__ +#pragma once /** \file * \ingroup bli @@ -76,5 +75,3 @@ bool BLI_newton3d_solve(Newton3D_DeltaFunc func_delta, #ifdef __cplusplus } #endif - -#endif /* __BLI_MATH_SOLVERS_H__ */ diff --git a/source/blender/blenlib/BLI_math_statistics.h b/source/blender/blenlib/BLI_math_statistics.h index a9f9ae39506..aebc445002b 100644 --- a/source/blender/blenlib/BLI_math_statistics.h +++ b/source/blender/blenlib/BLI_math_statistics.h @@ -17,8 +17,7 @@ * All rights reserved. * */ -#ifndef __BLI_MATH_STATISTICS_H__ -#define __BLI_MATH_STATISTICS_H__ +#pragma once /** \file * \ingroup bli @@ -57,5 +56,3 @@ void BLI_covariance_m3_v3n(const float (*cos_v3)[3], #ifdef __cplusplus } #endif - -#endif /* __BLI_MATH_STATISTICS_H__ */ diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h index 362ab3769a0..1ccfe5d86b1 100644 --- a/source/blender/blenlib/BLI_math_vector.h +++ b/source/blender/blenlib/BLI_math_vector.h @@ -20,8 +20,7 @@ * * */ -#ifndef __BLI_MATH_VECTOR_H__ -#define __BLI_MATH_VECTOR_H__ +#pragma once /** \file * \ingroup bli @@ -526,5 +525,3 @@ void mul_vn_db(double *array_tar, const int size, const double f); #ifdef __cplusplus } #endif - -#endif /* __BLI_MATH_VECTOR_H__ */ diff --git a/source/blender/blenlib/BLI_memarena.h b/source/blender/blenlib/BLI_memarena.h index e0aff82e874..87a320e336d 100644 --- a/source/blender/blenlib/BLI_memarena.h +++ b/source/blender/blenlib/BLI_memarena.h @@ -21,8 +21,7 @@ * \ingroup bli */ -#ifndef __BLI_MEMARENA_H__ -#define __BLI_MEMARENA_H__ +#pragma once #include "BLI_compiler_attrs.h" @@ -55,5 +54,3 @@ void BLI_memarena_clear(MemArena *ma) ATTR_NONNULL(1); #ifdef __cplusplus } #endif - -#endif /* __BLI_MEMARENA_H__ */ diff --git a/source/blender/blenlib/BLI_memblock.h b/source/blender/blenlib/BLI_memblock.h index 8f66ee3b9cb..cb6b31d54e0 100644 --- a/source/blender/blenlib/BLI_memblock.h +++ b/source/blender/blenlib/BLI_memblock.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_MEMBLOCK_H__ -#define __BLI_MEMBLOCK_H__ +#pragma once /** \file * \ingroup bli @@ -63,5 +62,3 @@ void *BLI_memblock_elem_get(BLI_memblock *mblk, int chunk, int elem) ATTR_WARN_U #ifdef __cplusplus } #endif - -#endif /* __BLI_MEMBLOCK_H__ */ diff --git a/source/blender/blenlib/BLI_memiter.h b/source/blender/blenlib/BLI_memiter.h index 4aa9cdb6b6c..c7a715309e1 100644 --- a/source/blender/blenlib/BLI_memiter.h +++ b/source/blender/blenlib/BLI_memiter.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_MEMITER_H__ -#define __BLI_MEMITER_H__ +#pragma once /** \file * \ingroup bli @@ -69,5 +68,3 @@ void *BLI_memiter_iter_step_size(BLI_memiter_handle *iter, uint *r_size) ATTR_WA #ifdef __cplusplus } #endif - -#endif /* __BLI_MEMITER_H__ */ diff --git a/source/blender/blenlib/BLI_memory_utils.hh b/source/blender/blenlib/BLI_memory_utils.hh index 9f65fe0742e..d663bf4038d 100644 --- a/source/blender/blenlib/BLI_memory_utils.hh +++ b/source/blender/blenlib/BLI_memory_utils.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_MEMORY_UTILS_HH__ -#define __BLI_MEMORY_UTILS_HH__ +#pragma once /** \file * \ingroup bli @@ -429,5 +428,3 @@ inline constexpr int64_t default_inline_buffer_capacity(size_t element_size) } } // namespace blender - -#endif /* __BLI_MEMORY_UTILS_HH__ */ diff --git a/source/blender/blenlib/BLI_mempool.h b/source/blender/blenlib/BLI_mempool.h index 3749f9e1b76..3ee6f182593 100644 --- a/source/blender/blenlib/BLI_mempool.h +++ b/source/blender/blenlib/BLI_mempool.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_MEMPOOL_H__ -#define __BLI_MEMPOOL_H__ +#pragma once /** \file * \ingroup bli @@ -97,5 +96,3 @@ void BLI_mempool_iter_threadsafe_free(BLI_mempool_iter *iter_arr) ATTR_NONNULL() #ifdef __cplusplus } #endif - -#endif /* __BLI_MEMPOOL_H__ */ diff --git a/source/blender/blenlib/BLI_noise.h b/source/blender/blenlib/BLI_noise.h index 32731ff24fc..cb66b0552df 100644 --- a/source/blender/blenlib/BLI_noise.h +++ b/source/blender/blenlib/BLI_noise.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_NOISE_H__ -#define __BLI_NOISE_H__ +#pragma once /** \file * \ingroup bli @@ -79,5 +78,3 @@ void cellNoiseV(float x, float y, float z, float r_ca[3]); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index 30823773d6c..05c256ccf1c 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. */ -#ifndef __BLI_PATH_UTIL_H__ -#define __BLI_PATH_UTIL_H__ +#pragma once /** \file * \ingroup bli @@ -158,5 +157,3 @@ bool BLI_path_suffix(char *string, size_t maxlen, const char *suffix, const char #ifdef __cplusplus } #endif - -#endif /* __BLI_PATH_UTIL_H__ */ diff --git a/source/blender/blenlib/BLI_polyfill_2d.h b/source/blender/blenlib/BLI_polyfill_2d.h index cb12b73c1d5..ca63ea5af87 100644 --- a/source/blender/blenlib/BLI_polyfill_2d.h +++ b/source/blender/blenlib/BLI_polyfill_2d.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_POLYFILL_2D_H__ -#define __BLI_POLYFILL_2D_H__ +#pragma once /** \file * \ingroup bli @@ -45,5 +44,3 @@ void BLI_polyfill_calc(const float (*coords)[2], #ifdef __cplusplus } #endif - -#endif /* __BLI_POLYFILL_2D_H__ */ diff --git a/source/blender/blenlib/BLI_polyfill_2d_beautify.h b/source/blender/blenlib/BLI_polyfill_2d_beautify.h index 94c4b412225..2c5296269ae 100644 --- a/source/blender/blenlib/BLI_polyfill_2d_beautify.h +++ b/source/blender/blenlib/BLI_polyfill_2d_beautify.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_POLYFILL_2D_BEAUTIFY_H__ -#define __BLI_POLYFILL_2D_BEAUTIFY_H__ +#pragma once /** \file * \ingroup bli @@ -51,5 +50,3 @@ float BLI_polyfill_beautify_quad_rotate_calc_ex(const float v1[2], #ifdef __cplusplus } #endif - -#endif /* __BLI_POLYFILL_2D_BEAUTIFY_H__ */ diff --git a/source/blender/blenlib/BLI_probing_strategies.hh b/source/blender/blenlib/BLI_probing_strategies.hh index 0e5338fa6ed..a37a979b754 100644 --- a/source/blender/blenlib/BLI_probing_strategies.hh +++ b/source/blender/blenlib/BLI_probing_strategies.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_PROBING_STRATEGIES_HH__ -#define __BLI_PROBING_STRATEGIES_HH__ +#pragma once /** \file * \ingroup bli @@ -246,5 +245,3 @@ using DefaultProbingStrategy = PythonProbingStrategy<>; // clang-format on } // namespace blender - -#endif /* __BLI_PROBING_STRATEGIES_HH__ */ diff --git a/source/blender/blenlib/BLI_quadric.h b/source/blender/blenlib/BLI_quadric.h index 1383a19ed1f..fdb7d1e67ac 100644 --- a/source/blender/blenlib/BLI_quadric.h +++ b/source/blender/blenlib/BLI_quadric.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_QUADRIC_H__ -#define __BLI_QUADRIC_H__ +#pragma once /** \file * \ingroup bli @@ -50,5 +49,3 @@ bool BLI_quadric_optimize(const Quadric *q, double v[3], const double epsilon); #ifdef __cplusplus } #endif - -#endif /* __BLI_QUADRIC_H__ */ diff --git a/source/blender/blenlib/BLI_rand.h b/source/blender/blenlib/BLI_rand.h index c55bbd26db5..78a323c2431 100644 --- a/source/blender/blenlib/BLI_rand.h +++ b/source/blender/blenlib/BLI_rand.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_RAND_H__ -#define __BLI_RAND_H__ +#pragma once #include "BLI_compiler_attrs.h" #include "BLI_sys_types.h" @@ -116,5 +115,3 @@ void BLI_hammersley_2d_sequence(unsigned int n, double *r); #ifdef __cplusplus } #endif - -#endif /* __BLI_RAND_H__ */ diff --git a/source/blender/blenlib/BLI_rand.hh b/source/blender/blenlib/BLI_rand.hh index 7a98ee0f2bb..b3c9c376141 100644 --- a/source/blender/blenlib/BLI_rand.hh +++ b/source/blender/blenlib/BLI_rand.hh @@ -18,8 +18,7 @@ * \ingroup bli */ -#ifndef __BLI_RAND_HH__ -#define __BLI_RAND_HH__ +#pragma once #include "BLI_float2.hh" #include "BLI_float3.hh" @@ -143,5 +142,3 @@ class RandomNumberGenerator { }; } // namespace blender - -#endif /* __BLI_RAND_HH__ */ diff --git a/source/blender/blenlib/BLI_rect.h b/source/blender/blenlib/BLI_rect.h index 14d18308ed6..ae3eb9d2144 100644 --- a/source/blender/blenlib/BLI_rect.h +++ b/source/blender/blenlib/BLI_rect.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_RECT_H__ -#define __BLI_RECT_H__ +#pragma once /** \file * \ingroup bli @@ -166,5 +165,3 @@ BLI_INLINE float BLI_rctf_size_y(const struct rctf *rct) #ifdef __cplusplus } #endif - -#endif /* __BLI_RECT_H__ */ diff --git a/source/blender/blenlib/BLI_resource_collector.hh b/source/blender/blenlib/BLI_resource_collector.hh index e1be87d8af2..20180f3b2c9 100644 --- a/source/blender/blenlib/BLI_resource_collector.hh +++ b/source/blender/blenlib/BLI_resource_collector.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_RESOURCE_COLLECTOR_HH__ -#define __BLI_RESOURCE_COLLECTOR_HH__ +#pragma once /** \file * \ingroup bli @@ -147,5 +146,3 @@ class ResourceCollector : NonCopyable, NonMovable { }; } // namespace blender - -#endif /* __BLI_RESOURCE_COLLECTOR_HH__ */ diff --git a/source/blender/blenlib/BLI_scanfill.h b/source/blender/blenlib/BLI_scanfill.h index 376ea9d88de..cf74bc14cac 100644 --- a/source/blender/blenlib/BLI_scanfill.h +++ b/source/blender/blenlib/BLI_scanfill.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_SCANFILL_H__ -#define __BLI_SCANFILL_H__ +#pragma once /** \file * \ingroup bli @@ -131,5 +130,3 @@ bool BLI_scanfill_calc_self_isect(ScanFillContext *sf_ctx, #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenlib/BLI_session_uuid.h b/source/blender/blenlib/BLI_session_uuid.h index 35d358b8e7c..05355a85b39 100644 --- a/source/blender/blenlib/BLI_session_uuid.h +++ b/source/blender/blenlib/BLI_session_uuid.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_SESSION_UUID_H__ -#define __BLI_SESSION_UUID_H__ +#pragma once /** \file * \ingroup bli @@ -67,5 +66,3 @@ template<> struct DefaultHash<SessionUUID> { } // namespace blender #endif - -#endif /* __BLI_SESSION_UUID_H__ */ diff --git a/source/blender/blenlib/BLI_set.hh b/source/blender/blenlib/BLI_set.hh index 90adea69e06..eb4e258b679 100644 --- a/source/blender/blenlib/BLI_set.hh +++ b/source/blender/blenlib/BLI_set.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_SET_HH__ -#define __BLI_SET_HH__ +#pragma once /** \file * \ingroup bli @@ -831,5 +830,3 @@ template<typename Key, using RawSet = Set<Key, InlineBufferCapacity, ProbingStrategy, Hash, IsEqual, Slot, RawAllocator>; } // namespace blender - -#endif /* __BLI_SET_HH__ */ diff --git a/source/blender/blenlib/BLI_set_slots.hh b/source/blender/blenlib/BLI_set_slots.hh index b78ed37f534..ee5da17fcaf 100644 --- a/source/blender/blenlib/BLI_set_slots.hh +++ b/source/blender/blenlib/BLI_set_slots.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_SET_SLOTS_HH__ -#define __BLI_SET_SLOTS_HH__ +#pragma once /** \file * \ingroup bli @@ -411,5 +410,3 @@ template<typename Key> struct DefaultSetSlot<Key *> { }; } // namespace blender - -#endif /* __BLI_SET_SLOTS_HH__ */ diff --git a/source/blender/blenlib/BLI_smallhash.h b/source/blender/blenlib/BLI_smallhash.h index cb0330d1bad..daea2fcd914 100644 --- a/source/blender/blenlib/BLI_smallhash.h +++ b/source/blender/blenlib/BLI_smallhash.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_SMALLHASH_H__ -#define __BLI_SMALLHASH_H__ +#pragma once /** \file * \ingroup bli @@ -81,5 +80,3 @@ double BLI_smallhash_calc_quality(SmallHash *sh); #ifdef __cplusplus } #endif - -#endif /* __BLI_SMALLHASH_H__ */ diff --git a/source/blender/blenlib/BLI_sort.h b/source/blender/blenlib/BLI_sort.h index 08e61915a83..969816086e2 100644 --- a/source/blender/blenlib/BLI_sort.h +++ b/source/blender/blenlib/BLI_sort.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_SORT_H__ -#define __BLI_SORT_H__ +#pragma once /** \file * \ingroup bli @@ -39,5 +38,3 @@ void BLI_qsort_r(void *a, size_t n, size_t es, BLI_sort_cmp_t cmp, void *thunk) __attribute__((nonnull(1, 5))) #endif ; - -#endif /* __BLI_SORT_H__ */ diff --git a/source/blender/blenlib/BLI_sort_utils.h b/source/blender/blenlib/BLI_sort_utils.h index 9c99f893a1f..e54252f4e1b 100644 --- a/source/blender/blenlib/BLI_sort_utils.h +++ b/source/blender/blenlib/BLI_sort_utils.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_SORT_UTILS_H__ -#define __BLI_SORT_UTILS_H__ +#pragma once /** \file * \ingroup bli @@ -64,5 +63,3 @@ int BLI_sortutil_cmp_ptr_reverse(const void *a_, const void *b_); #ifdef __cplusplus } #endif - -#endif /* __BLI_SORT_UTILS_H__ */ diff --git a/source/blender/blenlib/BLI_span.hh b/source/blender/blenlib/BLI_span.hh index 81b86f647f6..5aee0028846 100644 --- a/source/blender/blenlib/BLI_span.hh +++ b/source/blender/blenlib/BLI_span.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_SPAN_HH__ -#define __BLI_SPAN_HH__ +#pragma once /** \file * \ingroup bli @@ -656,5 +655,3 @@ void assert_same_size(const T1 &v1, const T2 &v2, const T3 &v3) } } /* namespace blender */ - -#endif /* __BLI_SPAN_HH__ */ diff --git a/source/blender/blenlib/BLI_stack.h b/source/blender/blenlib/BLI_stack.h index 9fc25e378a3..b00bc0a2e57 100644 --- a/source/blender/blenlib/BLI_stack.h +++ b/source/blender/blenlib/BLI_stack.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_STACK_H__ -#define __BLI_STACK_H__ +#pragma once /** \file * \ingroup bli @@ -55,5 +54,3 @@ bool BLI_stack_is_empty(const BLI_Stack *stack) ATTR_WARN_UNUSED_RESULT ATTR_NON #ifdef __cplusplus } #endif - -#endif /* __BLI_STACK_H__ */ diff --git a/source/blender/blenlib/BLI_stack.hh b/source/blender/blenlib/BLI_stack.hh index 75ae9df79a4..5fa7867e176 100644 --- a/source/blender/blenlib/BLI_stack.hh +++ b/source/blender/blenlib/BLI_stack.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_STACK_HH__ -#define __BLI_STACK_HH__ +#pragma once /** \file * \ingroup bli @@ -386,5 +385,3 @@ template<typename T, int64_t InlineBufferCapacity = default_inline_buffer_capaci using RawStack = Stack<T, InlineBufferCapacity, RawAllocator>; } /* namespace blender */ - -#endif /* __BLI_STACK_HH__ */ diff --git a/source/blender/blenlib/BLI_strict_flags.h b/source/blender/blenlib/BLI_strict_flags.h index cf7888d3c5e..6cee6b64797 100644 --- a/source/blender/blenlib/BLI_strict_flags.h +++ b/source/blender/blenlib/BLI_strict_flags.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_STRICT_FLAGS_H__ -#define __BLI_STRICT_FLAGS_H__ +#pragma once /** \file * \ingroup bli @@ -53,5 +52,3 @@ # pragma warning(error : 4305) /* truncation from 'type1' to 'type2' */ # pragma warning(error : 4389) /* signed/unsigned mismatch */ #endif - -#endif /* __BLI_STRICT_FLAGS_H__ */ diff --git a/source/blender/blenlib/BLI_string.h b/source/blender/blenlib/BLI_string.h index 00e4e3485d1..d1fab065959 100644 --- a/source/blender/blenlib/BLI_string.h +++ b/source/blender/blenlib/BLI_string.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_STRING_H__ -#define __BLI_STRING_H__ +#pragma once /** \file * \ingroup bli @@ -206,5 +205,3 @@ int BLI_string_find_split_words(const char *str, #ifdef __cplusplus } #endif - -#endif /* __BLI_STRING_H__ */ diff --git a/source/blender/blenlib/BLI_string_cursor_utf8.h b/source/blender/blenlib/BLI_string_cursor_utf8.h index f8afff214a3..e78c7b56cf7 100644 --- a/source/blender/blenlib/BLI_string_cursor_utf8.h +++ b/source/blender/blenlib/BLI_string_cursor_utf8.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_STRING_CURSOR_UTF8_H__ -#define __BLI_STRING_CURSOR_UTF8_H__ +#pragma once /** \file * \ingroup bli @@ -59,5 +58,3 @@ void BLI_str_cursor_step_utf32(const char32_t *str, #ifdef __cplusplus } #endif - -#endif /* __BLI_STRING_CURSOR_UTF8_H__ */ diff --git a/source/blender/blenlib/BLI_string_ref.hh b/source/blender/blenlib/BLI_string_ref.hh index 06fc66f6b55..8bf4821f72a 100644 --- a/source/blender/blenlib/BLI_string_ref.hh +++ b/source/blender/blenlib/BLI_string_ref.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_STRING_REF_HH__ -#define __BLI_STRING_REF_HH__ +#pragma once /** \file * \ingroup bli @@ -371,5 +370,3 @@ inline StringRef StringRefBase::substr(const int64_t start, const int64_t size) } } // namespace blender - -#endif /* __BLI_STRING_REF_HH__ */ diff --git a/source/blender/blenlib/BLI_string_utf8.h b/source/blender/blenlib/BLI_string_utf8.h index 78e7113b6ef..3620a3ccc55 100644 --- a/source/blender/blenlib/BLI_string_utf8.h +++ b/source/blender/blenlib/BLI_string_utf8.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_STRING_UTF8_H__ -#define __BLI_STRING_UTF8_H__ +#pragma once /** \file * \ingroup bli @@ -115,5 +114,3 @@ int BLI_str_utf8_offset_from_column(const char *str, int column); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenlib/BLI_string_utils.h b/source/blender/blenlib/BLI_string_utils.h index 857b22540e9..46fb096599f 100644 --- a/source/blender/blenlib/BLI_string_utils.h +++ b/source/blender/blenlib/BLI_string_utils.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_STRING_UTILS_H__ -#define __BLI_STRING_UTILS_H__ +#pragma once /** \file * \ingroup bli @@ -97,5 +96,3 @@ bool BLI_uniquename(struct ListBase *list, #ifdef __cplusplus } #endif - -#endif /* __BLI_STRING_UTILS_H__ */ diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h index ef15ce111b6..ff1f6af9573 100644 --- a/source/blender/blenlib/BLI_sys_types.h +++ b/source/blender/blenlib/BLI_sys_types.h @@ -31,8 +31,7 @@ * For these rogue platforms, we make the typedefs ourselves. */ -#ifndef __BLI_SYS_TYPES_H__ -#define __BLI_SYS_TYPES_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -89,5 +88,3 @@ typedef unsigned char uchar; #ifdef __cplusplus } #endif - -#endif /* eof */ diff --git a/source/blender/blenlib/BLI_system.h b/source/blender/blenlib/BLI_system.h index 50f8adc20f6..8dd0706e1e2 100644 --- a/source/blender/blenlib/BLI_system.h +++ b/source/blender/blenlib/BLI_system.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_SYSTEM_H__ -#define __BLI_SYSTEM_H__ +#pragma once #include <stdio.h> @@ -64,5 +63,3 @@ void BLI_windows_handle_exception(void *exception); #ifdef __cplusplus } #endif - -#endif /* __BLI_SYSTEM_H__ */ diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h index 920a0a8f650..a281aaa5b51 100644 --- a/source/blender/blenlib/BLI_threads.h +++ b/source/blender/blenlib/BLI_threads.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_THREADS_H__ -#define __BLI_THREADS_H__ +#pragma once /** \file * \ingroup bli @@ -205,5 +204,3 @@ void BLI_thread_put_thread_on_fast_node(void); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenlib/BLI_timecode.h b/source/blender/blenlib/BLI_timecode.h index d3c6803130a..1dff50efa23 100644 --- a/source/blender/blenlib/BLI_timecode.h +++ b/source/blender/blenlib/BLI_timecode.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_TIMECODE_H__ -#define __BLI_TIMECODE_H__ +#pragma once /** \file * \ingroup BLI @@ -49,5 +48,3 @@ size_t BLI_timecode_string_from_time_seconds(char *str, #ifdef __cplusplus } #endif - -#endif /* __BLI_TIMECODE_H__ */ diff --git a/source/blender/blenlib/BLI_timeit.hh b/source/blender/blenlib/BLI_timeit.hh index f0968587597..8e107585576 100644 --- a/source/blender/blenlib/BLI_timeit.hh +++ b/source/blender/blenlib/BLI_timeit.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_TIMEIT_HH__ -#define __BLI_TIMEIT_HH__ +#pragma once #include <chrono> #include <iostream> @@ -56,5 +55,3 @@ class ScopedTimer { } // namespace blender::timeit #define SCOPED_TIMER(name) blender::timeit::ScopedTimer scoped_timer(name) - -#endif /* __BLI_TIMEIT_HH__ */ diff --git a/source/blender/blenlib/BLI_timer.h b/source/blender/blenlib/BLI_timer.h index 144fcd0a0d7..19275ff5b9a 100644 --- a/source/blender/blenlib/BLI_timer.h +++ b/source/blender/blenlib/BLI_timer.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_TIMER_H__ -#define __BLI_TIMER_H__ +#pragma once #include "BLI_sys_types.h" @@ -61,5 +60,3 @@ void BLI_timer_on_file_load(void); #ifdef __cplusplus } #endif - -#endif /* __BLI_TIMER_H__ */ diff --git a/source/blender/blenlib/BLI_utildefines_iter.h b/source/blender/blenlib/BLI_utildefines_iter.h index bbd83573e53..5fb6248e1e9 100644 --- a/source/blender/blenlib/BLI_utildefines_iter.h +++ b/source/blender/blenlib/BLI_utildefines_iter.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_UTILDEFINES_ITER_H__ -#define __BLI_UTILDEFINES_ITER_H__ +#pragma once /** \file * \ingroup bli @@ -42,5 +41,3 @@ for (int _src = (src), _src2 = _src * 2, _dst2 = (dst)*2, _error = _dst2 - _src, i = 0, _delta; \ ((void)(_delta = divide_floor_i(_error, _dst2)), (void)(i -= _delta), (i < _src)); \ _error -= (_delta * _dst2) + _src2) - -#endif /* __BLI_UTILDEFINES_ITER_H__ */ diff --git a/source/blender/blenlib/BLI_utildefines_stack.h b/source/blender/blenlib/BLI_utildefines_stack.h index 9f9bfb0405d..f50004ef79a 100644 --- a/source/blender/blenlib/BLI_utildefines_stack.h +++ b/source/blender/blenlib/BLI_utildefines_stack.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_UTILDEFINES_STACK_H__ -#define __BLI_UTILDEFINES_STACK_H__ +#pragma once /** \file * \ingroup bli @@ -99,5 +98,3 @@ } \ ((void)0) #endif - -#endif /* __BLI_UTILDEFINES_STACK_H__ */ diff --git a/source/blender/blenlib/BLI_utildefines_variadic.h b/source/blender/blenlib/BLI_utildefines_variadic.h index f5a420a7faf..be0d0b93cc7 100644 --- a/source/blender/blenlib/BLI_utildefines_variadic.h +++ b/source/blender/blenlib/BLI_utildefines_variadic.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_UTILDEFINES_VARIADIC_H__ -#define __BLI_UTILDEFINES_VARIADIC_H__ +#pragma once /** \file * \ingroup bli @@ -47,5 +46,3 @@ _VA_NARGS_GLUE(_VA_NARGS_OVERLOAD_MACRO(name, VA_NARGS_COUNT(__VA_ARGS__)), (__VA_ARGS__)) /* clang-format on */ - -#endif /* __BLI_UTILDEFINES_VARIADIC_H__ */ diff --git a/source/blender/blenlib/BLI_utility_mixins.hh b/source/blender/blenlib/BLI_utility_mixins.hh index 61444e36725..69b1d85b3b6 100644 --- a/source/blender/blenlib/BLI_utility_mixins.hh +++ b/source/blender/blenlib/BLI_utility_mixins.hh @@ -18,8 +18,7 @@ * \ingroup bli */ -#ifndef __BLI_UTILITY_MIXINS_HH__ -#define __BLI_UTILITY_MIXINS_HH__ +#pragma once namespace blender { @@ -54,5 +53,3 @@ class NonMovable { }; } // namespace blender - -#endif /* __BLI_UTILITY_MIXINS_HH__ */ diff --git a/source/blender/blenlib/BLI_uvproject.h b/source/blender/blenlib/BLI_uvproject.h index 4bfa1601b16..6028d95bda0 100644 --- a/source/blender/blenlib/BLI_uvproject.h +++ b/source/blender/blenlib/BLI_uvproject.h @@ -13,8 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_UVPROJECT_H__ -#define __BLI_UVPROJECT_H__ +#pragma once /** \file * \ingroup bli @@ -53,5 +52,3 @@ void BLI_uvproject_camera_info_scale(struct ProjCameraInfo *uci, float scale_x, #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenlib/BLI_vector.hh b/source/blender/blenlib/BLI_vector.hh index 7eac511bf4a..52e966267b5 100644 --- a/source/blender/blenlib/BLI_vector.hh +++ b/source/blender/blenlib/BLI_vector.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_VECTOR_HH__ -#define __BLI_VECTOR_HH__ +#pragma once /** \file * \ingroup bli @@ -832,5 +831,3 @@ template<typename T, int64_t InlineBufferCapacity = default_inline_buffer_capaci using RawVector = Vector<T, InlineBufferCapacity, RawAllocator>; } /* namespace blender */ - -#endif /* __BLI_VECTOR_HH__ */ diff --git a/source/blender/blenlib/BLI_vector_set.hh b/source/blender/blenlib/BLI_vector_set.hh index f007d41118f..c3b15bcf454 100644 --- a/source/blender/blenlib/BLI_vector_set.hh +++ b/source/blender/blenlib/BLI_vector_set.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_VECTOR_SET_HH__ -#define __BLI_VECTOR_SET_HH__ +#pragma once /** \file * \ingroup bli @@ -744,5 +743,3 @@ template<typename Key, using RawVectorSet = VectorSet<Key, ProbingStrategy, Hash, IsEqual, Slot, RawAllocator>; } // namespace blender - -#endif /* __BLI_VECTOR_SET_HH__ */ diff --git a/source/blender/blenlib/BLI_vector_set_slots.hh b/source/blender/blenlib/BLI_vector_set_slots.hh index 49e6d4daedb..0e75c4690a4 100644 --- a/source/blender/blenlib/BLI_vector_set_slots.hh +++ b/source/blender/blenlib/BLI_vector_set_slots.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BLI_VECTOR_SET_SLOTS_HH__ -#define __BLI_VECTOR_SET_SLOTS_HH__ +#pragma once /** \file * \ingroup bli @@ -167,5 +166,3 @@ template<typename Key> struct DefaultVectorSetSlot { }; } // namespace blender - -#endif /* __BLI_VECTOR_SET_SLOTS_HH__ */ diff --git a/source/blender/blenlib/BLI_vfontdata.h b/source/blender/blenlib/BLI_vfontdata.h index 047a72ec59a..0bb32ca24b7 100644 --- a/source/blender/blenlib/BLI_vfontdata.h +++ b/source/blender/blenlib/BLI_vfontdata.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_VFONTDATA_H__ -#define __BLI_VFONTDATA_H__ +#pragma once /** \file * \ingroup bli @@ -59,5 +58,3 @@ VChar *BLI_vfontchar_copy(const VChar *vchar_src, const int flag); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/blenlib/BLI_voronoi_2d.h b/source/blender/blenlib/BLI_voronoi_2d.h index a48f32c283a..92c7d367b48 100644 --- a/source/blender/blenlib/BLI_voronoi_2d.h +++ b/source/blender/blenlib/BLI_voronoi_2d.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_VORONOI_2D_H__ -#define __BLI_VORONOI_2D_H__ +#pragma once struct ListBase; @@ -81,5 +80,3 @@ void BLI_voronoi_triangulate(const VoronoiSite *sites, #ifdef __cplusplus } #endif - -#endif /* __BLI_VORONOI_2D_H__ */ diff --git a/source/blender/blenlib/BLI_voxel.h b/source/blender/blenlib/BLI_voxel.h index 82854c57928..eb84f0a27ee 100644 --- a/source/blender/blenlib/BLI_voxel.h +++ b/source/blender/blenlib/BLI_voxel.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_VOXEL_H__ -#define __BLI_VOXEL_H__ +#pragma once /** \file * \ingroup bli @@ -46,5 +45,3 @@ float BLI_voxel_sample_tricubic(const float *data, #ifdef __cplusplus } #endif - -#endif /* __BLI_VOXEL_H__ */ diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h index 3d59ad21251..2de6098f6be 100644 --- a/source/blender/blenlib/BLI_winstuff.h +++ b/source/blender/blenlib/BLI_winstuff.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __BLI_WINSTUFF_H__ -#define __BLI_WINSTUFF_H__ +#pragma once /** \file * \ingroup bli @@ -111,5 +110,3 @@ int BLI_getInstallationDir(char *str); #ifdef __cplusplus } #endif - -#endif /* __BLI_WINSTUFF_H__ */ diff --git a/source/blender/blenlib/PIL_time.h b/source/blender/blenlib/PIL_time.h index 21ebc9d4b90..311869e844a 100644 --- a/source/blender/blenlib/PIL_time.h +++ b/source/blender/blenlib/PIL_time.h @@ -22,8 +22,7 @@ * \brief Platform independent time functions. */ -#ifndef __PIL_TIME_H__ -#define __PIL_TIME_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -51,5 +50,3 @@ void PIL_sleep_ms(int ms); #ifdef __cplusplus } #endif - -#endif /* __PIL_TIME_H__ */ diff --git a/source/blender/blenlib/PIL_time_utildefines.h b/source/blender/blenlib/PIL_time_utildefines.h index ffe753badf8..d404a8b2b8a 100644 --- a/source/blender/blenlib/PIL_time_utildefines.h +++ b/source/blender/blenlib/PIL_time_utildefines.h @@ -22,8 +22,7 @@ * \brief Utility defines for timing/benchmarks. */ -#ifndef __PIL_TIME_UTILDEFINES_H__ -#define __PIL_TIME_UTILDEFINES_H__ +#pragma once #include "BLI_utildefines.h" /* for AT */ #include "PIL_time.h" /* for PIL_check_seconds_timer */ @@ -127,5 +126,3 @@ fflush(stdout); \ } \ (void)0 - -#endif /* __PIL_TIME_UTILDEFINES_H__ */ |