[Bf-blender-cvs] [8b55e0e] blender-v2.77-release: Remove newly added function (harmless but unused)

Campbell Barton noreply at git.blender.org
Tue Apr 5 10:58:38 CEST 2016


Commit: 8b55e0e8778da53c88bfc6f58973c010f141b024
Author: Campbell Barton
Date:   Tue Apr 5 18:58:42 2016 +1000
Branches: blender-v2.77-release
https://developer.blender.org/rB8b55e0e8778da53c88bfc6f58973c010f141b024

Remove newly added function (harmless but unused)

===================================================================

M	source/blender/blenlib/intern/BLI_ghash.c

===================================================================

diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c
index 06946e5..e2f1f83 100644
--- a/source/blender/blenlib/intern/BLI_ghash.c
+++ b/source/blender/blenlib/intern/BLI_ghash.c
@@ -1395,30 +1395,6 @@ bool BLI_gset_add(GSet *gs, void *key)
 }
 
 /**
- * Set counterpart to #BLI_ghash_ensure_p_ex.
- * similar to BLI_gset_add, except it returns the key pointer.
- *
- * \warning Caller _must_ write to \a r_key when returning false.
- */
-bool BLI_gset_ensure_p_ex(GSet *gs, const void *key, void ***r_key)
-{
-	const unsigned int hash = ghash_keyhash((GHash *)gs, key);
-	const unsigned int bucket_index = ghash_bucket_index((GHash *)gs, hash);
-	GSetEntry *e = (GSetEntry *)ghash_lookup_entry_ex((GHash *)gs, key, bucket_index);
-	const bool haskey = (e != NULL);
-
-	if (!haskey) {
-		/* pass 'key' incase we resize */
-		e = BLI_mempool_alloc(((GHash *)gs)->entrypool);
-		ghash_insert_ex_keyonly_entry((GHash *)gs, (void *)key, bucket_index, (Entry *)e);
-		e->key = NULL;  /* caller must re-assign */
-	}
-
-	*r_key = &e->key;
-	return haskey;
-}
-
-/**
  * Adds the key to the set (duplicates are managed).
  * Matching #BLI_ghash_reinsert
  *




More information about the Bf-blender-cvs mailing list