[Bf-blender-cvs] [0929821] master: Cycles: Accidentally inverted the logic of NDEBUG macro

Sergey Sharybin noreply at git.blender.org
Thu Sep 25 21:35:21 CEST 2014


Commit: 0929821590bf4e22447625ff9be0e38e4a74fede
Author: Sergey Sharybin
Date:   Fri Sep 26 01:34:43 2014 +0600
Branches: master
https://developer.blender.org/rB0929821590bf4e22447625ff9be0e38e4a74fede

Cycles: Accidentally inverted the logic of NDEBUG macro

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

M	intern/cycles/util/util_types.h

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

diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h
index 7b7e04c..b98ee6f 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -33,7 +33,7 @@
 
 #ifndef __KERNEL_GPU__
 
-#  ifndef NDEBUG
+#  ifdef NDEBUG
 #    define ccl_device static inline
 #  else
 #    define ccl_device static
@@ -45,7 +45,7 @@
 
 #if defined(_WIN32) && !defined(FREE_WINDOWS)
 
-#  ifndef NDEBUG
+#  ifdef NDEBUG
 #    define ccl_device_inline static __forceinline
 #  else
 #    define ccl_device_inline static
@@ -58,7 +58,7 @@
 #define ccl_try_align(...) /* not support for function arguments (error C2719) */
 #endif
 #define ccl_may_alias
-#  ifndef NDEBUG
+#  ifdef NDEBUG
 #    define ccl_always_inline __forceinline
 #  else
 #    define ccl_always_inline




More information about the Bf-blender-cvs mailing list