diff options
author | Joseph Eagar <joeedh@gmail.com> | 2021-07-01 07:38:18 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2021-07-01 07:38:18 +0300 |
commit | d0759840a00edff4cb1c345694c12f6a281fbdc8 (patch) | |
tree | c06e8d92d08fd55d215d2a439fc456682a3e7b47 /source/blender/blenlib/BLI_ghash.h | |
parent | 5b19b2cb5675c1e0d64176cfa73e17eed3132038 (diff) | |
parent | 02df67875af9ac6b3af22362cec31ff74a15176f (diff) |
Merge branch 'master' into temp_bmesh_multires
Diffstat (limited to 'source/blender/blenlib/BLI_ghash.h')
-rw-r--r-- | source/blender/blenlib/BLI_ghash.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h index 01a18b81b87..4386f52140d 100644 --- a/source/blender/blenlib/BLI_ghash.h +++ b/source/blender/blenlib/BLI_ghash.h @@ -87,7 +87,7 @@ GHash *BLI_ghash_new_ex(GHashHashFP hashfp, GHash *BLI_ghash_new(GHashHashFP hashfp, GHashCmpFP cmpfp, const char *info) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; -GHash *BLI_ghash_copy(GHash *gh, +GHash *BLI_ghash_copy(const GHash *gh, GHashKeyCopyFP keycopyfp, GHashValCopyFP valcopyfp) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; void BLI_ghash_free(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp); @@ -96,8 +96,8 @@ void BLI_ghash_insert(GHash *gh, void *key, void *val); bool BLI_ghash_reinsert( GHash *gh, void *key, void *val, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp); void *BLI_ghash_replace_key(GHash *gh, void *key); -void *BLI_ghash_lookup(GHash *gh, const void *key) ATTR_WARN_UNUSED_RESULT; -void *BLI_ghash_lookup_default(GHash *gh, +void *BLI_ghash_lookup(const GHash *gh, const void *key) ATTR_WARN_UNUSED_RESULT; +void *BLI_ghash_lookup_default(const GHash *gh, const void *key, void *val_default) ATTR_WARN_UNUSED_RESULT; void **BLI_ghash_lookup_p(GHash *gh, const void *key) ATTR_WARN_UNUSED_RESULT; @@ -116,10 +116,10 @@ void BLI_ghash_clear_ex(GHash *gh, void *BLI_ghash_popkey(GHash *gh, const void *key, GHashKeyFreeFP keyfreefp) ATTR_WARN_UNUSED_RESULT; -bool BLI_ghash_haskey(GHash *gh, const void *key) ATTR_WARN_UNUSED_RESULT; +bool BLI_ghash_haskey(const GHash *gh, const void *key) ATTR_WARN_UNUSED_RESULT; bool BLI_ghash_pop(GHash *gh, GHashIterState *state, void **r_key, void **r_val) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -unsigned int BLI_ghash_len(GHash *gh) ATTR_WARN_UNUSED_RESULT; +unsigned int BLI_ghash_len(const GHash *gh) ATTR_WARN_UNUSED_RESULT; void BLI_ghash_flag_set(GHash *gh, unsigned int flag); void BLI_ghash_flag_clear(GHash *gh, unsigned int flag); @@ -138,7 +138,7 @@ void BLI_ghashIterator_step(GHashIterator *ghi); BLI_INLINE void *BLI_ghashIterator_getKey(GHashIterator *ghi) ATTR_WARN_UNUSED_RESULT; BLI_INLINE void *BLI_ghashIterator_getValue(GHashIterator *ghi) ATTR_WARN_UNUSED_RESULT; BLI_INLINE void **BLI_ghashIterator_getValue_p(GHashIterator *ghi) ATTR_WARN_UNUSED_RESULT; -BLI_INLINE bool BLI_ghashIterator_done(GHashIterator *ghi) ATTR_WARN_UNUSED_RESULT; +BLI_INLINE bool BLI_ghashIterator_done(const GHashIterator *ghi) ATTR_WARN_UNUSED_RESULT; struct _gh_Entry { void *next, *key, *val; @@ -155,7 +155,7 @@ BLI_INLINE void **BLI_ghashIterator_getValue_p(GHashIterator *ghi) { return &((struct _gh_Entry *)ghi->curEntry)->val; } -BLI_INLINE bool BLI_ghashIterator_done(GHashIterator *ghi) +BLI_INLINE bool BLI_ghashIterator_done(const GHashIterator *ghi) { return !ghi->curEntry; } @@ -245,8 +245,8 @@ GSet *BLI_gset_new_ex(GSetHashFP hashfp, GSet *BLI_gset_new(GSetHashFP hashfp, GSetCmpFP cmpfp, const char *info) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; -GSet *BLI_gset_copy(GSet *gs, GSetKeyCopyFP keycopyfp) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; -unsigned int BLI_gset_len(GSet *gs) ATTR_WARN_UNUSED_RESULT; +GSet *BLI_gset_copy(const GSet *gs, GSetKeyCopyFP keycopyfp) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; +unsigned int BLI_gset_len(const GSet *gs) ATTR_WARN_UNUSED_RESULT; void BLI_gset_flag_set(GSet *gs, unsigned int flag); void BLI_gset_flag_clear(GSet *gs, unsigned int flag); void BLI_gset_free(GSet *gs, GSetKeyFreeFP keyfreefp); @@ -255,7 +255,7 @@ bool BLI_gset_add(GSet *gs, void *key); bool BLI_gset_ensure_p_ex(GSet *gs, const void *key, void ***r_key); bool BLI_gset_reinsert(GSet *gh, void *key, GSetKeyFreeFP keyfreefp); void *BLI_gset_replace_key(GSet *gs, void *key); -bool BLI_gset_haskey(GSet *gs, const void *key) ATTR_WARN_UNUSED_RESULT; +bool BLI_gset_haskey(const GSet *gs, const void *key) ATTR_WARN_UNUSED_RESULT; bool BLI_gset_pop(GSet *gs, GSetIterState *state, void **r_key) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); bool BLI_gset_remove(GSet *gs, const void *key, GSetKeyFreeFP keyfreefp); @@ -263,7 +263,7 @@ void BLI_gset_clear_ex(GSet *gs, GSetKeyFreeFP keyfreefp, const unsigned int nen void BLI_gset_clear(GSet *gs, GSetKeyFreeFP keyfreefp); /* When set's are used for key & value. */ -void *BLI_gset_lookup(GSet *gs, const void *key) ATTR_WARN_UNUSED_RESULT; +void *BLI_gset_lookup(const GSet *gs, const void *key) ATTR_WARN_UNUSED_RESULT; void *BLI_gset_pop_key(GSet *gs, const void *key) ATTR_WARN_UNUSED_RESULT; /** \} */ @@ -303,9 +303,9 @@ BLI_INLINE void BLI_gsetIterator_step(GSetIterator *gsi) { BLI_ghashIterator_step((GHashIterator *)gsi); } -BLI_INLINE bool BLI_gsetIterator_done(GSetIterator *gsi) +BLI_INLINE bool BLI_gsetIterator_done(const GSetIterator *gsi) { - return BLI_ghashIterator_done((GHashIterator *)gsi); + return BLI_ghashIterator_done((const GHashIterator *)gsi); } #define GSET_ITER(gs_iter_, gset_) \ @@ -325,8 +325,8 @@ BLI_INLINE bool BLI_gsetIterator_done(GSetIterator *gsi) /* For testing, debugging only */ #ifdef GHASH_INTERNAL_API -int BLI_ghash_buckets_len(GHash *gh); -int BLI_gset_buckets_len(GSet *gs); +int BLI_ghash_buckets_len(const GHash *gh); +int BLI_gset_buckets_len(const GSet *gs); double BLI_ghash_calc_quality_ex(GHash *gh, double *r_load, |