archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

add versions of BLI_ghash_int_new, BLI_ghash_str_new, etc. that take a reserve argument.

Browse Source
This commit is contained in:
Campbell Barton
2013-08-24 15:14:50 +00:00
parent aefe93d909
commit 4b1fc0593e
2 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenlib/BLI_ghash.h
View File

@@ -153,9 +153,17 @@ int BLI_ghashutil_strcmp(const void *a, const void *b);
unsigned int BLI_ghashutil_inthash(const void *ptr);
int BLI_ghashutil_intcmp(const void *a, const void *b);
GHash *BLI_ghash_ptr_new_ex(const char *info,
const unsigned int nentries_reserve);
GHash *BLI_ghash_ptr_new(const char *info);
GHash *BLI_ghash_str_new_ex(const char *info,
const unsigned int nentries_reserve);
GHash *BLI_ghash_str_new(const char *info);
GHash *BLI_ghash_int_new_ex(const char *info,
const unsigned int nentries_reserve);
GHash *BLI_ghash_int_new(const char *info);
GHash *BLI_ghash_pair_new_ex(const char *info,
const unsigned int nentries_reserve);
GHash *BLI_ghash_pair_new(const char *info);
typedef struct GHashPair {

35
source/blender/blenlib/intern/BLI_ghash.c
View File

@@ -467,21 +467,48 @@ int BLI_ghashutil_strcmp(const void *a, const void *b)
return strcmp(a, b);
}
GHash *BLI_ghash_ptr_new_ex(const char *info,
const unsigned int nentries_reserve)
{
return BLI_ghash_new_ex(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, info,
nentries_reserve);
}
GHash *BLI_ghash_ptr_new(const char *info)
{
return BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, info);
return BLI_ghash_ptr_new_ex(info, 0);
}
GHash *BLI_ghash_str_new_ex(const char *info,
const unsigned int nentries_reserve)
{
return BLI_ghash_new_ex(BLI_ghashutil_strhash, BLI_ghashutil_strcmp, info,
nentries_reserve);
}
GHash *BLI_ghash_str_new(const char *info)
{
return BLI_ghash_new(BLI_ghashutil_strhash, BLI_ghashutil_strcmp, info);
return BLI_ghash_str_new_ex(info, 0);
}
GHash *BLI_ghash_int_new_ex(const char *info,
const unsigned int nentries_reserve)
{
return BLI_ghash_new_ex(BLI_ghashutil_inthash, BLI_ghashutil_intcmp, info,
nentries_reserve);
}
GHash *BLI_ghash_int_new(const char *info)
{
return BLI_ghash_new(BLI_ghashutil_inthash, BLI_ghashutil_intcmp, info);
return BLI_ghash_int_new_ex(info, 0);
}
GHash *BLI_ghash_pair_new_ex(const char *info,
const unsigned int nentries_reserve)
{
return BLI_ghash_new_ex(BLI_ghashutil_pairhash, BLI_ghashutil_paircmp, info,
nentries_reserve);
}
GHash *BLI_ghash_pair_new(const char *info)
{
return BLI_ghash_new(BLI_ghashutil_pairhash, BLI_ghashutil_paircmp, info);
return BLI_ghash_pair_new_ex(info, 0);
}
GHashPair *BLI_ghashutil_pairalloc(const void *first, const void *second)