[Bf-blender-cvs] [f6564df3515] master: Cleanup: remove duplicate compiler attribute
Campbell Barton
noreply at git.blender.org
Fri Mar 11 05:30:46 CET 2022
Commit: f6564df3515fcabfdb18cbff9b2e1a1579430848
Author: Campbell Barton
Date: Fri Mar 11 15:29:11 2022 +1100
Branches: master
https://developer.blender.org/rBf6564df3515fcabfdb18cbff9b2e1a1579430848
Cleanup: remove duplicate compiler attribute
===================================================================
M source/blender/blenlib/BLI_memiter.h
===================================================================
diff --git a/source/blender/blenlib/BLI_memiter.h b/source/blender/blenlib/BLI_memiter.h
index 727092706c4..bf54b0ea14d 100644
--- a/source/blender/blenlib/BLI_memiter.h
+++ b/source/blender/blenlib/BLI_memiter.h
@@ -34,11 +34,12 @@ BLI_memiter *BLI_memiter_create(unsigned int chunk_size_min)
ATTR_MALLOC ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL;
void *BLI_memiter_alloc(BLI_memiter *mi, unsigned int size)
/* WARNING: `ATTR_MALLOC` attribute on #BLI_memiter_alloc causes crash, see: D2756. */
- ATTR_RETURNS_NONNULL ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL ATTR_NONNULL(1);
+ ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL ATTR_NONNULL(1);
void BLI_memiter_alloc_from(BLI_memiter *mi, uint elem_size, const void *data_from)
ATTR_NONNULL(1, 3);
-void *BLI_memiter_calloc(BLI_memiter *mi, unsigned int size)
- ATTR_RETURNS_NONNULL ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL ATTR_NONNULL(1);
+void *BLI_memiter_calloc(BLI_memiter *mi,
+ unsigned int size) ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL
+ ATTR_NONNULL(1);
void BLI_memiter_destroy(BLI_memiter *mi) ATTR_NONNULL(1);
void BLI_memiter_clear(BLI_memiter *mi) ATTR_NONNULL(1);
unsigned int BLI_memiter_count(const BLI_memiter *mi) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1);
More information about the Bf-blender-cvs
mailing list