[Bf-blender-cvs] [0e085c6] master: BLI_kdtree: use UNLIKELY

Campbell Barton noreply at git.blender.org
Fri Jun 13 16:47:57 CEST 2014


Commit: 0e085c637eefb8007a355b5b318d9c65b9c76fda
Author: Campbell Barton
Date:   Thu May 29 02:37:16 2014 +1000
https://developer.blender.org/rB0e085c637eefb8007a355b5b318d9c65b9c76fda

BLI_kdtree: use UNLIKELY

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

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

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

diff --git a/source/blender/blenlib/intern/BLI_kdtree.c b/source/blender/blenlib/intern/BLI_kdtree.c
index ed6e6e3..082a54a 100644
--- a/source/blender/blenlib/intern/BLI_kdtree.c
+++ b/source/blender/blenlib/intern/BLI_kdtree.c
@@ -207,7 +207,7 @@ int BLI_kdtree_find_nearest(
 	BLI_assert(tree->is_balanced == true);
 #endif
 
-	if (!tree->root)
+	if (UNLIKELY(!tree->root))
 		return -1;
 
 	stack = defaultstack;
@@ -322,7 +322,7 @@ int BLI_kdtree_find_nearest_n__normal(
 	BLI_assert(tree->is_balanced == true);
 #endif
 
-	if (!tree->root || n == 0)
+	if (UNLIKELY(!tree->root || n == 0))
 		return 0;
 
 	stack = defaultstack;
@@ -445,7 +445,7 @@ int BLI_kdtree_range_search__normal(
 	BLI_assert(tree->is_balanced == true);
 #endif
 
-	if (!tree->root)
+	if (UNLIKELY(!tree->root))
 		return 0;
 
 	stack = defaultstack;




More information about the Bf-blender-cvs mailing list