[Bf-blender-cvs] [1b72ad0] master: GHOST: don't instantiate assert arg

Campbell Barton noreply at git.blender.org
Thu Apr 9 05:57:30 CEST 2015


Commit: 1b72ad0c3d57e4c19a90f27106e4ffd435c0e04e
Author: Campbell Barton
Date:   Thu Apr 9 13:55:46 2015 +1000
Branches: master
https://developer.blender.org/rB1b72ad0c3d57e4c19a90f27106e4ffd435c0e04e

GHOST: don't instantiate assert arg

When debugging is disabled, function calls in an assert should never run.

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

M	intern/ghost/intern/GHOST_Debug.h

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

diff --git a/intern/ghost/intern/GHOST_Debug.h b/intern/ghost/intern/GHOST_Debug.h
index c99f3df..db49627 100644
--- a/intern/ghost/intern/GHOST_Debug.h
+++ b/intern/ghost/intern/GHOST_Debug.h
@@ -80,7 +80,7 @@
 	    }                                                                     \
 	} (void)0
 #else  // GHOST_DEBUG
-#  define GHOST_ASSERT(x, info) (void)(x)
+#  define GHOST_ASSERT(x, info) ((void)0)
 #endif // GHOST_DEBUG
 
 #endif // __GHOST_DEBUG_H__




More information about the Bf-blender-cvs mailing list