diff options
Diffstat (limited to 'source/blender/blenlib/BLI_edgehash.h')
| -rw-r--r-- | source/blender/blenlib/BLI_edgehash.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/source/blender/blenlib/BLI_edgehash.h b/source/blender/blenlib/BLI_edgehash.h index 184e3bb57e7..41f0d41d1e0 100644 --- a/source/blender/blenlib/BLI_edgehash.h +++ b/source/blender/blenlib/BLI_edgehash.h @@ -57,8 +57,10 @@ void BLI_edgehash_free(EdgeHash *eh, EdgeHashFreeFP free_value); void BLI_edgehash_print(EdgeHash *eh); void BLI_edgehash_insert(EdgeHash *eh, unsigned int v0, unsigned int v1, void *val); bool BLI_edgehash_reinsert(EdgeHash *eh, unsigned int v0, unsigned int v1, void *val); -void *BLI_edgehash_lookup(EdgeHash *eh, unsigned int v0, unsigned int v1) ATTR_WARN_UNUSED_RESULT; -void *BLI_edgehash_lookup_default(EdgeHash *eh, +void *BLI_edgehash_lookup(const EdgeHash *eh, + unsigned int v0, + unsigned int v1) ATTR_WARN_UNUSED_RESULT; +void *BLI_edgehash_lookup_default(const EdgeHash *eh, unsigned int v0, unsigned int v1, void *default_value) ATTR_WARN_UNUSED_RESULT; @@ -73,8 +75,10 @@ bool BLI_edgehash_remove(EdgeHash *eh, EdgeHashFreeFP free_value); void *BLI_edgehash_popkey(EdgeHash *eh, unsigned int v0, unsigned int v1) ATTR_WARN_UNUSED_RESULT; -bool BLI_edgehash_haskey(EdgeHash *eh, unsigned int v0, unsigned int v1) ATTR_WARN_UNUSED_RESULT; -int BLI_edgehash_len(EdgeHash *eh) ATTR_WARN_UNUSED_RESULT; +bool BLI_edgehash_haskey(const EdgeHash *eh, + unsigned int v0, + unsigned int v1) ATTR_WARN_UNUSED_RESULT; +int BLI_edgehash_len(const EdgeHash *eh) ATTR_WARN_UNUSED_RESULT; void BLI_edgehash_clear_ex(EdgeHash *eh, EdgeHashFreeFP free_value, const uint reserve); void BLI_edgehash_clear(EdgeHash *eh, EdgeHashFreeFP free_value); @@ -86,7 +90,7 @@ BLI_INLINE void BLI_edgehashIterator_step(EdgeHashIterator *ehi) { ehi->index++; } -BLI_INLINE bool BLI_edgehashIterator_isDone(EdgeHashIterator *ehi) +BLI_INLINE bool BLI_edgehashIterator_isDone(const EdgeHashIterator *ehi) { return ehi->index >= ehi->length; } @@ -128,10 +132,12 @@ typedef struct EdgeSetIterator { EdgeSet *BLI_edgeset_new_ex(const char *info, const unsigned int nentries_reserve) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; EdgeSet *BLI_edgeset_new(const char *info) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; -int BLI_edgeset_len(EdgeSet *es) ATTR_WARN_UNUSED_RESULT; +int BLI_edgeset_len(const EdgeSet *es) ATTR_WARN_UNUSED_RESULT; bool BLI_edgeset_add(EdgeSet *es, unsigned int v0, unsigned int v1); void BLI_edgeset_insert(EdgeSet *es, unsigned int v0, unsigned int v1); -bool BLI_edgeset_haskey(EdgeSet *es, unsigned int v0, unsigned int v1) ATTR_WARN_UNUSED_RESULT; +bool BLI_edgeset_haskey(const EdgeSet *es, + unsigned int v0, + unsigned int v1) ATTR_WARN_UNUSED_RESULT; void BLI_edgeset_free(EdgeSet *es); /* rely on inline api for now */ @@ -150,7 +156,7 @@ BLI_INLINE void BLI_edgesetIterator_step(EdgeSetIterator *esi) { esi->index++; } -BLI_INLINE bool BLI_edgesetIterator_isDone(EdgeSetIterator *esi) +BLI_INLINE bool BLI_edgesetIterator_isDone(const EdgeSetIterator *esi) { return esi->index >= esi->length; } |