[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59474] trunk/blender/source/blender/ blenlib: add versions of BLI_ghash_int_new, BLI_ghash_str_new, etc.

[Campbell Barton]

Revision: 59474
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59474
Author:   campbellbarton
Date:     2013-08-24 15:14:50 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
add versions of BLI_ghash_int_new, BLI_ghash_str_new, etc. that take a reserve argument.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_ghash.h
    trunk/blender/source/blender/blenlib/intern/BLI_ghash.c

Modified: trunk/blender/source/blender/blenlib/BLI_ghash.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_ghash.h	2013-08-24 15:09:57 UTC (rev 59473)
+++ trunk/blender/source/blender/blenlib/BLI_ghash.h	2013-08-24 15:14:50 UTC (rev 59474)
@@ -153,9 +153,17 @@
 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 {

Modified: trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_ghash.c	2013-08-24 15:09:57 UTC (rev 59473)
+++ trunk/blender/source/blender/blenlib/intern/BLI_ghash.c	2013-08-24 15:14:50 UTC (rev 59474)
@@ -467,21 +467,48 @@
 	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)