[rkward-cvs] SF.net SVN: rkward:[4484] trunk/rkward/rkward/debug.h

[tfry at users.sourceforge.net]

Revision: 4484
          http://rkward.svn.sourceforge.net/rkward/?rev=4484&view=rev
Author:   tfry
Date:     2012-12-07 10:08:59 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Whoops. Make sure to respect debug level when generating traces. Also, state failed expression in assert.

Modified Paths:
--------------
    trunk/rkward/rkward/debug.h

Modified: trunk/rkward/rkward/debug.h
===================================================================
--- trunk/rkward/rkward/debug.h	2012-12-07 09:53:32 UTC (rev 4483)
+++ trunk/rkward/rkward/debug.h	2012-12-07 10:08:59 UTC (rev 4484)
@@ -49,9 +49,9 @@
 // Debug functions 
 #	define RK_DO(expr,flags,level) if ((flags & RK_Debug_Flags) && (level >= RK_Debug_Level)) { expr; }
 #	define RK_DEBUG(flags,level,...) { if ((flags & RK_Debug_Flags) && (level >= RK_Debug_Level)) RKDebug (flags,level,__VA_ARGS__); }
-#	define RK_ASSERT(x) if (!(x)) RKDebug (ALL, DL_FATAL, "Assert failed at %s - function %s line %d", __FILE__, __FUNCTION__, __LINE__);
+#	define RK_ASSERT(x) if (!(x)) RK_DEBUG (ALL, DL_FATAL, "Assert '%s' failed at %s - function %s line %d", #x, __FILE__, __FUNCTION__, __LINE__);
 #	ifndef RKWARD_NO_TRACE
-#		define RK_TRACE(flags) RKDebug (flags, DL_TRACE, "Trace: %s - function %s line %d", __FILE__, __FUNCTION__, __LINE__);
+#		define RK_TRACE(flags) RK_DEBUG (flags, DL_TRACE, "Trace: %s - function %s line %d", __FILE__, __FUNCTION__, __LINE__);
 #	else
 #		define RK_TRACE(flags)
 #	endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.