[Bf-blender-cvs] [a2120001a87] master: Cleanup: avoid function call for pointer compare

Campbell Barton noreply at git.blender.org
Sat Jan 5 09:57:19 CET 2019


Commit: a2120001a876518061b52d63362733ebedaedd47
Author: Campbell Barton
Date:   Sat Jan 5 19:55:25 2019 +1100
Branches: master
https://developer.blender.org/rBa2120001a876518061b52d63362733ebedaedd47

Cleanup: avoid function call for pointer compare

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

M	source/blender/blenkernel/intern/anim_sys.c
M	source/blender/blenlib/intern/BLI_ghash_utils.c

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

diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 1fe51b95ae4..26453ffa9ab 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -2054,8 +2054,8 @@ static bool nlaevalchan_keycmp(const void *a, const void *b)
 	const NlaEvalChannelKey *A = a;
 	const NlaEvalChannelKey *B = b;
 
-	return (BLI_ghashutil_ptrcmp(A->ptr.data, B->ptr.data) ||
-	        BLI_ghashutil_ptrcmp(A->prop, B->prop));
+	return ((A->ptr.data != B->ptr.data) ||
+	        (A->prop != B->prop));
 }
 
 /* ---------------------- */
diff --git a/source/blender/blenlib/intern/BLI_ghash_utils.c b/source/blender/blenlib/intern/BLI_ghash_utils.c
index a0d9fefe465..053f177939c 100644
--- a/source/blender/blenlib/intern/BLI_ghash_utils.c
+++ b/source/blender/blenlib/intern/BLI_ghash_utils.c
@@ -203,8 +203,8 @@ bool BLI_ghashutil_paircmp(const void *a, const void *b)
 	const GHashPair *A = a;
 	const GHashPair *B = b;
 
-	return (BLI_ghashutil_ptrcmp(A->first, B->first) ||
-	        BLI_ghashutil_ptrcmp(A->second, B->second));
+	return ((A->first != B->first) ||
+	        (A->second != B->second));
 }
 
 void BLI_ghashutil_pairfree(void *ptr)



More information about the Bf-blender-cvs mailing list