diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-07-02 21:35:05 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-07-02 21:35:05 +0300 |
| commit | 2b5e150db03a0e4e1c7e57274399123571fcc66d (patch) | |
| tree | 71c1cb8c5f90816db138b2a8b6d524b355519046 /source | |
| parent | 626a287c893c0c7827bc2a665399207140055199 (diff) | |
BLI_GHash: add BLI_gset_str_new helpers.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenlib/BLI_ghash.h | 8 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/BLI_ghash.c | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h index a9f8d9fc268..a81fee2cdb7 100644 --- a/source/blender/blenlib/BLI_ghash.h +++ b/source/blender/blenlib/BLI_ghash.h @@ -234,11 +234,11 @@ void BLI_gset_clear_ex(GSet *gs, GSetKeyFreeFP keyfreefp, const unsigned int nentries_reserve); void BLI_gset_clear(GSet *gs, GSetKeyFreeFP keyfreefp); -GSet *BLI_gset_ptr_new_ex(const char *info, - const unsigned int nentries_reserve) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; +GSet *BLI_gset_ptr_new_ex(const char *info, const unsigned int nentries_reserve) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; GSet *BLI_gset_ptr_new(const char *info); -GSet *BLI_gset_pair_new_ex(const char *info, - const unsigned int nentries_reserve) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; +GSet *BLI_gset_str_new_ex(const char *info, const unsigned int nentries_reserve) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; +GSet *BLI_gset_str_new(const char *info); +GSet *BLI_gset_pair_new_ex(const char *info, const unsigned int nentries_reserve) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; GSet *BLI_gset_pair_new(const char *info) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; /* rely on inline api for now */ diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index 9287d62a683..91ac0ce1c43 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -1356,6 +1356,15 @@ GSet *BLI_gset_ptr_new(const char *info) return BLI_gset_ptr_new_ex(info, 0); } +GSet *BLI_gset_str_new_ex(const char *info, const unsigned int nentries_reserve) +{ + return BLI_gset_new_ex(BLI_ghashutil_strhash_p, BLI_ghashutil_strcmp, info, nentries_reserve); +} +GSet *BLI_gset_str_new(const char *info) +{ + return BLI_gset_str_new_ex(info, 0); +} + GSet *BLI_gset_pair_new_ex(const char *info, const unsigned int nentries_reserve) { return BLI_gset_new_ex(BLI_ghashutil_pairhash, BLI_ghashutil_paircmp, info, nentries_reserve); |